设备转移更新信息添加主用户UserID和主用户名

Controller/CloudTest.py

@@ -61,15 +61,23 @@ class cloudTestView(View):
             deviceUser_qs = Device_User.objects.filter(
                 Q(username=loginName) | Q(phone=loginName) | Q(userEmail=loginName)).values('userID')
             userID = deviceUser_qs[0]['userID']
-            # 判断该用户的userID是否跟转移的一样
+            # 判断新用户的userID是否跟旧用户的一样
             if userID == oldUserID:
                 return response.json(10009)
             # 判断该用户是否已有此设备UID
-            new_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isExist=1)
-            if new_deviceInfo_qs:
+            # new_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isExist=1)
+            # if new_deviceInfo_qs:
+            #     return response.json(10009)
+            # 获取新用户的主用户UserID和主用户名
+            new_deviceInfo_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'primaryUserID',
+                                                                                               'primaryMaster')
+            if new_deviceInfo_qs[0]['UID'] == userID:
+                # 新用户已有此设备
                 return response.json(10009)
+            primaryUserID = new_deviceInfo_qs[0]['primaryUserID']
+            primaryMaster = new_deviceInfo_qs[0]['primaryMaster']
             # 更新设备信息
-            old_deviceInfo_qs.update(userID=userID)
+            old_deviceInfo_qs.update(userID=userID, primaryUserID=primaryUserID, primaryMaster=primaryMaster)
         except Exception as e:
             # print(e)
             return response.json(500, repr(e))
@@ -144,3 +152,4 @@ class cloudTestView(View):
                 return response.json(500, repr(e))
             else:
                 return response.json(0)
+        response.json(404)