设备转移 不是主用户无法转移4

Controller/CloudTest.py

@@ -7,12 +7,12 @@
 """
 import time
 from django.db import transaction
-from django.db.models import Q
 from django.views.generic.base import View
 
-from Model.models import Device_User, Device_Info, Order_Model, UID_Bucket, StsCrdModel, VodHlsModel
-from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
+from Service.ModelService import ModelService
+from Object.ResponseObject import ResponseObject
+from Model.models import Device_User, Device_Info, Order_Model, UID_Bucket, StsCrdModel, VodHlsModel
 
 
 class cloudTestView(View):
@@ -49,39 +49,33 @@ class cloudTestView(View):
     def deviceTransfer(self, request_dict, response):
         # 设备转移
         oldUserID = request_dict.get("oldUserID", None)
-        loginName = request_dict.get("username", None)
+        username = request_dict.get("username", None)
         uid = request_dict.get('uid', None)
 
         try:
             # 查询该userID下是否存在此设备
-            old_deviceInfo_qs = Device_Info.objects.filter(userID_id=oldUserID, UID=uid, isExist=1)
+            old_deviceInfo_qs = Device_Info.objects.filter(userID_id=oldUserID, UID=uid, isExist=1).values('isShare','vodPrimaryUserID')
             if not old_deviceInfo_qs.exists():
                 return response.json(10008)
-            # 登录方式可能为用户名,手机号或邮箱登录
-            deviceUser_qs = Device_User.objects.filter(
-                Q(username=loginName) | Q(phone=loginName) | Q(userEmail=loginName)).values('userID')
-            newUserID = deviceUser_qs[0]['userID']
             # 判断新用户的userID是否跟旧用户的一样
+            newUserID = ModelService.get_userID_byname(username)
             if newUserID == oldUserID:
                 return response.json(10009)
+            # 分享的设备不能转移
+            isShare = old_deviceInfo_qs[0]['isShare']
+            if isShare:
+                return response.json(10015)
+            # 旧用户是设备主用户才能转移
+            vodPrimaryUserID = old_deviceInfo_qs[0]['vodPrimaryUserID']
+            if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
+                return response.json(10037)
             # 判断新用户是否已有此设备UID
             new_deviceInfo_qs = Device_Info.objects.filter(userID_id=newUserID, UID=uid, isExist=1)
             if new_deviceInfo_qs:
                 return response.json(10009)
-            # 分享的设备不能转移
-            isShare = Device_Info.objects.get(userID_id=oldUserID, UID=uid).isShare
-            if isShare:
-                return response.json(10015)
+
             # 获取新设备的username
             newUserName = Device_User.objects.get(userID=newUserID).username
-
-            main_exist = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
-
-            if not main_exist.exists():
-                ismain = Device_Info.objects.filter(UID=uid, vodPrimaryUserID=oldUserID)
-                if not ismain.exists():
-                    return response.json(10037)
-
             vodPrimaryUserID = newUserID
             vodPrimaryMaster = newUserName