fix: 后台添加角色按客服账号定位;下单OpenID字段名修正
This commit is contained in:
@@ -527,11 +527,15 @@ class ModifyAdminUserView(APIView):
|
|||||||
if not target_phone:
|
if not target_phone:
|
||||||
return Response({'code': 400, 'msg': '缺少目标用户账号'})
|
return Response({'code': 400, 'msg': '缺少目标用户账号'})
|
||||||
|
|
||||||
|
# Phone 非唯一,同一手机号可能对应多个微信用户;后台操作只定位客服账号
|
||||||
|
target_user = User.query.filter(
|
||||||
|
Phone=target_phone,
|
||||||
|
KefuProfile__isnull=False,
|
||||||
|
).first()
|
||||||
|
if not target_user:
|
||||||
|
return Response({'code': 404, 'msg': '用户不存在或非后台账号'})
|
||||||
try:
|
try:
|
||||||
target_user = User.query.get(Phone=target_phone)
|
|
||||||
target_kefu = target_user.KefuProfile
|
target_kefu = target_user.KefuProfile
|
||||||
except User.DoesNotExist:
|
|
||||||
return Response({'code': 404, 'msg': '用户不存在'})
|
|
||||||
except UserKefu.DoesNotExist:
|
except UserKefu.DoesNotExist:
|
||||||
return Response({'code': 404, 'msg': '用户扩展信息缺失'})
|
return Response({'code': 404, 'msg': '用户扩展信息缺失'})
|
||||||
|
|
||||||
|
|||||||
@@ -765,8 +765,8 @@ class CreateOrderView(APIView):
|
|||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
# 获取当前用户信息
|
# 获取当前用户信息
|
||||||
current_user = request.user
|
current_user = request.user
|
||||||
laoban_yonghuid = getattr(current_user, 'yonghuid', '')
|
laoban_yonghuid = getattr(current_user, 'UserUID', '') or getattr(current_user, 'yonghuid', '')
|
||||||
user_openid = getattr(current_user, 'openid', '')
|
user_openid = getattr(current_user, 'OpenID', '') or getattr(current_user, 'openid', '')
|
||||||
|
|
||||||
if not user_openid:
|
if not user_openid:
|
||||||
return Response({'code': 10, 'msg': '用户openid不存在', 'data': None})
|
return Response({'code': 10, 'msg': '用户openid不存在', 'data': None})
|
||||||
|
|||||||
Reference in New Issue
Block a user