|
@@ -116,7 +116,7 @@ class CloudVodView(View):
|
|
|
|
|
|
def do_get_details(self, request_dict, response):
|
|
|
did = request_dict.get('did', None)
|
|
|
- dvqs = Device_Info.objects.filter(id=did,isShare=False).values('UID')
|
|
|
+ dvqs = Device_Info.objects.filter(id=did, isShare=False).values('UID')
|
|
|
if not dvqs.exists():
|
|
|
return response.json(12)
|
|
|
UID = dvqs[0]['UID']
|
|
@@ -197,8 +197,8 @@ class CloudVodView(View):
|
|
|
return response.json(12)
|
|
|
if not did or not channel or not rank:
|
|
|
return response.json(444, 'did,channel,rank')
|
|
|
- smqs = Store_Meal.objects.filter(id=rank).\
|
|
|
- values("currency", "price", "content", "day", "bucket__storeDay","bucket__region")
|
|
|
+ smqs = Store_Meal.objects.filter(id=rank). \
|
|
|
+ values("currency", "price", "content", "day", "bucket__storeDay", "bucket__region")
|
|
|
if not smqs.exists():
|
|
|
return response.json(10, '套餐不存在')
|
|
|
currency = smqs[0]['currency']
|
|
@@ -206,19 +206,22 @@ class CloudVodView(View):
|
|
|
content = smqs[0]['content']
|
|
|
day = smqs[0]['day']
|
|
|
uid = qs[0]['UID']
|
|
|
- ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=CommonService.get_utc()).\
|
|
|
- values("bucket__storeDay","bucket__region")
|
|
|
+ ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=CommonService.get_utc()). \
|
|
|
+ values("bucket__storeDay", "bucket__region")
|
|
|
if ubqs.exists():
|
|
|
if ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
|
|
|
return response.json(10, '不可降级')
|
|
|
elif ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
|
|
|
- return response.json(10,'区域不一致')
|
|
|
+ return response.json(10, '区域不一致')
|
|
|
# 续费流程
|
|
|
nowTime = CommonService.get_utc()
|
|
|
# 判断是否存在未完成订单
|
|
|
- hasOrder = Order_Model.objects.filter(UID=uid,channel=channel,addTime__lte=3600+nowTime,status=0,rank_id=rank).values('paypal')
|
|
|
+ hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__lte=3600 + nowTime, status=0,
|
|
|
+ rank_id=rank). \
|
|
|
+ values('paypal')
|
|
|
if hasOrder.exists():
|
|
|
- return response.json(0, {"redirectUrl": hasOrder[0]['paypal']})
|
|
|
+ approval_url = hasOrder[0]['paypal']
|
|
|
+ return response.json(0, {"redirectUrl": approval_url})
|
|
|
# 新增流程
|
|
|
orderID = CommonService.createOrderID()
|
|
|
call_sub_url = "{SERVER_DOMAIN}cloudVod/payExecute?orderID={orderID}". \
|
|
@@ -359,7 +362,7 @@ class CloudVodView(View):
|
|
|
hour = request_dict.get('hour', None)
|
|
|
if not did or not channel or not daytime:
|
|
|
return response.json(444, 'did,channel')
|
|
|
- qs = Device_Info.objects.filter(userID_id=userID, id=did,isShare=False).values("UID")
|
|
|
+ qs = Device_Info.objects.filter(userID_id=userID, id=did, isShare=False).values("UID")
|
|
|
if not qs.exists():
|
|
|
return response.json(12)
|
|
|
uid = qs[0]['UID']
|
|
@@ -473,7 +476,7 @@ class CloudVodView(View):
|
|
|
channel = request_dict.get('channel', None)
|
|
|
if not did or not status or not channel:
|
|
|
return response.json(444, 'did,status,channel')
|
|
|
- dvqs = Device_Info.objects.filter(id=did, userID_id=userID,isShare=False).values("UID")
|
|
|
+ dvqs = Device_Info.objects.filter(id=did, userID_id=userID, isShare=False).values("UID")
|
|
|
if not dvqs.exists():
|
|
|
return response.json(12)
|
|
|
UID = dvqs[0]["UID"]
|
|
@@ -531,7 +534,7 @@ class CloudVodView(View):
|
|
|
|
|
|
did = request_dict.get('did', None)
|
|
|
channel = request_dict.get('channel', None)
|
|
|
- dvqs = Device_Info.objects.filter(id=did, userID_id=userID,isShare=False).values("UID")
|
|
|
+ dvqs = Device_Info.objects.filter(id=did, userID_id=userID, isShare=False).values("UID")
|
|
|
if not dvqs.exists():
|
|
|
return response.json(12)
|
|
|
UID = dvqs[0]["UID"]
|