|
@@ -60,24 +60,22 @@ 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']
|
|
|
+ newUserID = deviceUser_qs[0]['userID']
|
|
|
# 判断新用户的userID是否跟旧用户的一样
|
|
|
- if userID == oldUserID:
|
|
|
+ if newUserID == oldUserID:
|
|
|
return response.json(10009)
|
|
|
- # 判断该用户是否已有此设备UID
|
|
|
- # 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:
|
|
|
- # 新用户已有此设备
|
|
|
+ # 判断新用户是否已有此设备UID
|
|
|
+ new_deviceInfo_qs = Device_Info.objects.filter(userID_id=newUserID, UID=uid, isExist=1)
|
|
|
+ if new_deviceInfo_qs:
|
|
|
return response.json(10009)
|
|
|
- primaryUserID = new_deviceInfo_qs[0]['primaryUserID']
|
|
|
- primaryMaster = new_deviceInfo_qs[0]['primaryMaster']
|
|
|
+ # 分享的设备不能转移
|
|
|
+ isShare = Device_Info.objects.get(userID_id=oldUserID, UID=uid).isShare
|
|
|
+ if isShare:
|
|
|
+ return response.json(10015)
|
|
|
+ # 获取旧设备的username
|
|
|
+ oldUserName = Device_User.objects.get(userID=oldUserID).username
|
|
|
# 更新设备信息
|
|
|
- old_deviceInfo_qs.update(userID=userID, primaryUserID=primaryUserID, primaryMaster=primaryMaster)
|
|
|
+ old_deviceInfo_qs.update(userID=newUserID, primaryUserID=newUserID, primaryMaster=oldUserName)
|
|
|
except Exception as e:
|
|
|
# print(e)
|
|
|
return response.json(500, repr(e))
|