فهرست منبع

重复添加bug

chenjunkai 5 سال پیش
والد
کامیت
644cefbac8
2فایلهای تغییر یافته به همراه15 افزوده شده و 15 حذف شده
  1. 13 15
      Controller/UserController.py
  2. 2 0
      Object/ResponseObject.py

+ 13 - 15
Controller/UserController.py

@@ -1943,9 +1943,6 @@ class UnbundingWXView(TemplateView):
         if not lang:
             lang = request_dict.get('language', None)
         response = ResponseObject(lang)
-        was_limited = getattr(request, 'limited', False)
-        if was_limited is True:
-            return response.json(5)
         return self.ValidationError(request_dict, response)
 
     def post(self, request, *args, **kwargs):
@@ -1955,25 +1952,26 @@ class UnbundingWXView(TemplateView):
         if not lang:
             lang = request_dict.get('language', None)
         response = ResponseObject(lang)
-        was_limited = getattr(request, 'limited', False)
-        if was_limited is True:
-            return response.json(5)
         return self.ValidationError(request_dict, response)
 
     def ValidationError(self, request_dict, response):
         token = request_dict.get('token', None)
+        auth_type = request_dict.get('auth_type', None)
+        if not all([token, auth_type]):
+            return response.json(444, 'token,auth_type')
         tko = TokenObject(token)
         if tko.code == 0:
-            user_qs = Device_User.objects.filter(userID=tko.userID).values('phone', 'userEmail')
-            UserExtend = UserExtendModel.objects.filter(userID=tko.userID)
-            if (user_qs[0]['phone'] != '' or user_qs[0]['userEmail'] != ''):
-                if UserExtend.exists():
-                    UserExtend.update(authOpenID='', authType=0)
-                    return response.json(0)
+            userID = tko.userID
+            user_extend_qs = UserExtendModel.objects.filter(
+                ~Q(authOpenID='') & Q(userID_id=userID) & Q(authType=auth_type))
+            if user_extend_qs.exists():
+                user_qs = Device_User.objects.filter(phone='', userEmail='', userID=userID)
+                if user_qs.exists():
+                    return response.json(17)
                 else:
-                    return response.json(173)
+                    user_extend_qs.update(authOpenID='', authType=0)
+                    return response.json(0)
             else:
-                print('都是空')
-                return response.json(48)
+                return response.json(173)
         else:
             return response.json(tko.code)

+ 2 - 0
Object/ResponseObject.py

@@ -15,6 +15,7 @@ class ResponseObject(object):
             14: 'Device is not belong to you',
             15: 'Device has been bound',
             16: 'WeChat has been bound, please log in and unbind using WeChat',
+            17: 'No email or mobile phone login',
             44: 'System error! Can not send email',
             48: 'System object error!',
             89: 'Already send the code, please check it or get it again after 10m',
@@ -70,6 +71,7 @@ class ResponseObject(object):
             14: '设备不属于您',
             15: '设备已被绑定',
             16: '微信已被绑定,请使用微信登录并解绑',
+            17: '未绑定邮箱或者手机登录方式',
             44: '系统错误!无法发送电子邮件',
             48: '系统对象错误',
             89: '已发验证码,请检测或10分钟后重新获取。',