|
@@ -620,36 +620,6 @@ class CloudStorageView(View):
|
|
|
res = {'code': 404, 'msg': '设备未购买'}
|
|
|
return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
|
|
|
|
|
|
- # def do_change_vod_status(self, request_dict, userID, response):
|
|
|
- # uid = request_dict.get('uid', None)
|
|
|
- # status = request_dict.get('status', None)
|
|
|
- # channel = request_dict.get('channel', None)
|
|
|
- # if all([uid, status, channel]):
|
|
|
- # dv_qs = Device_Info.objects.filter(UID=uid, userID_id=userID, isShare=False, isExist=1)
|
|
|
- # if dv_qs.exists():
|
|
|
- # now_time = int(time.time())
|
|
|
- # ub_qs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=now_time)
|
|
|
- # if ub_qs.exists():
|
|
|
- # ub_qs.status = status
|
|
|
- # ub_qs.save()
|
|
|
- # if status == 0:
|
|
|
- # return response.json(0)
|
|
|
- # else:
|
|
|
- # utko = UidTokenObject()
|
|
|
- # utko.generate(data={'uid': uid, 'channel': channel})
|
|
|
- # uidTK = utko.token
|
|
|
- # uidTkUrl = "{SERVER_DOMAIN}cloudstorage/getsignsts?uidToken={uidToken}". \
|
|
|
- # format(uidToken=uidTK, SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
- # storeHlsUrl = "{SERVER_DOMAIN}cloudstorage/storeplaylist?uidToken={uidToken}". \
|
|
|
- # format(uidToken=uidTK, SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
- # return response.json(0, {'uidTkUrl': uidTkUrl, 'storeHlsUrl': storeHlsUrl})
|
|
|
- # else:
|
|
|
- # return response.json(10, '未购买')
|
|
|
- # else:
|
|
|
- # return response.json(12)
|
|
|
- # else:
|
|
|
- # return response.json(444, 'uid,status,channel')
|
|
|
-
|
|
|
def do_change_vod_status(self, request_dict, userID, response):
|
|
|
uid = request_dict.get('uid', None)
|
|
|
status = request_dict.get('status', None)
|
|
@@ -918,18 +888,18 @@ class CloudStorageView(View):
|
|
|
paymentId = request_dict.get('paymentId', None)
|
|
|
PayerID = request_dict.get('PayerID', None)
|
|
|
orderID = request_dict.get('orderID', None)
|
|
|
- # if not paymentId or not PayerID or not orderID:
|
|
|
- # red_url = "{SERVER_DOMAIN}cloudstorage/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
- # return HttpResponseRedirect(red_url)
|
|
|
- # paypalrestsdk.configure(PAYPAL_CRD)
|
|
|
- # # ID of the payment. This ID is provided when creating payment.
|
|
|
- # payment = paypalrestsdk.Payment.find(paymentId)
|
|
|
- # payres = payment.execute({"payer_id": PayerID})
|
|
|
- # print(payres)
|
|
|
- # if not payres:
|
|
|
- # red_url = "{SERVER_DOMAIN}cloudstorage/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
- # return HttpResponseRedirect(red_url)
|
|
|
- # print("Payment execute successfully")
|
|
|
+ if not paymentId or not PayerID or not orderID:
|
|
|
+ red_url = "{SERVER_DOMAIN}cloudstorage/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
+ return HttpResponseRedirect(red_url)
|
|
|
+ paypalrestsdk.configure(PAYPAL_CRD)
|
|
|
+ # ID of the payment. This ID is provided when creating payment.
|
|
|
+ payment = paypalrestsdk.Payment.find(paymentId)
|
|
|
+ payres = payment.execute({"payer_id": PayerID})
|
|
|
+ print(payres)
|
|
|
+ if not payres:
|
|
|
+ red_url = "{SERVER_DOMAIN}cloudstorage/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
+ return HttpResponseRedirect(red_url)
|
|
|
+ print("Payment execute successfully")
|
|
|
order_qs = Order_Model.objects.filter(orderID=orderID)
|
|
|
nowTime = int(time.time())
|
|
|
order_list = order_qs.values("UID", "channel", "commodity_code", "rank", "isSelectDiscounts", "userID__userID",
|