|
@@ -31,7 +31,7 @@ from django.views.generic.base import View
|
|
|
from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
|
|
|
SERVER_DOMAIN_SSL
|
|
|
from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket, StsCrdModel, \
|
|
|
- ExperienceContextModel, Pay_Type, CDKcontextModel
|
|
|
+ ExperienceContextModel, Pay_Type, CDKcontextModel, Device_User
|
|
|
from Object.AliPayObject import AliPayObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
@@ -1041,8 +1041,14 @@ class CloudStorageView(View):
|
|
|
if not dv_qs.exists():
|
|
|
return response.json(12)
|
|
|
|
|
|
- if dv_qs[0]['primaryUserID'] != '' and dv_qs[0]['primaryUserID'] != userID:
|
|
|
- return response.json(13, '非设备主用户无法购买')
|
|
|
+ dvq = Device_Info.objects.filter(UID=uid)
|
|
|
+ dvq = dvq.filter(~Q(primaryUserID='')).values('primaryUserID')
|
|
|
+ if dvq.exists():
|
|
|
+ if dvq[0]['primaryUserID'] != userID:
|
|
|
+ return response.json(10033)
|
|
|
+
|
|
|
+ # if dv_qs[0]['primaryUserID'] != '' and dv_qs[0]['primaryUserID'] != userID:
|
|
|
+ # return response.json(10033)
|
|
|
smqs = Store_Meal.objects.filter(id=rank, pay_type=pay_type). \
|
|
|
values('currency', 'price', 'content', 'day',
|
|
|
'commodity_type', 'title', 'content',
|
|
@@ -1221,13 +1227,14 @@ class CloudStorageView(View):
|
|
|
commodity_code=commodity_code, commodity_type=smqs[0]['commodity_type'],
|
|
|
rank_id=rank,status=1, uid_bucket_id=uid_bucket_id)
|
|
|
|
|
|
- # dvq = Device_Info.objects.filter(UID=UID, primaryUserID='', primaryMaster='')
|
|
|
- # if dvq.exists():
|
|
|
- # dvq_set_update_dict = {
|
|
|
- # 'primaryUserID': userid,
|
|
|
- # 'primaryMaster': username
|
|
|
- # }
|
|
|
- # dvq.update(**dvq_set_update_dict)
|
|
|
+ duq = Device_User.objects.filter(userID=userID).values('username')
|
|
|
+ dvq = Device_Info.objects.filter(UID=uid, primaryUserID='', primaryMaster='')
|
|
|
+ if dvq.exists():
|
|
|
+ dvq_set_update_dict = {
|
|
|
+ 'primaryUserID': userID,
|
|
|
+ 'primaryMaster': duq[0]['username']
|
|
|
+ }
|
|
|
+ dvq.update(**dvq_set_update_dict)
|
|
|
|
|
|
# return response.json(0)
|
|
|
returnurl = "{SERVER_DOMAIN}cloudstorage/payOK".format(SERVER_DOMAIN=SERVER_DOMAIN)
|