浏览代码

update field

lang 4 年之前
父节点
当前提交
bac8434d0f
共有 2 个文件被更改,包括 19 次插入43 次删除
  1. 12 42
      Controller/CloudStorage.py
  2. 7 1
      Object/ResponseObject.py

+ 12 - 42
Controller/CloudStorage.py

@@ -620,36 +620,6 @@ class CloudStorageView(View):
             res = {'code': 404, 'msg': '设备未购买'}
             res = {'code': 404, 'msg': '设备未购买'}
             return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
             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):
     def do_change_vod_status(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)
         uid = request_dict.get('uid', None)
         status = request_dict.get('status', None)
         status = request_dict.get('status', None)
@@ -918,18 +888,18 @@ class CloudStorageView(View):
         paymentId = request_dict.get('paymentId', None)
         paymentId = request_dict.get('paymentId', None)
         PayerID = request_dict.get('PayerID', None)
         PayerID = request_dict.get('PayerID', None)
         orderID = request_dict.get('orderID', 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)
         order_qs = Order_Model.objects.filter(orderID=orderID)
         nowTime = int(time.time())
         nowTime = int(time.time())
         order_list = order_qs.values("UID", "channel", "commodity_code", "rank", "isSelectDiscounts", "userID__userID",
         order_list = order_qs.values("UID", "channel", "commodity_code", "rank", "isSelectDiscounts", "userID__userID",

+ 7 - 1
Object/ResponseObject.py

@@ -82,6 +82,9 @@ class ResponseObject(object):
             10012: 'Experience packages cannot be transferred',
             10012: 'Experience packages cannot be transferred',
             10013: 'Original equipment package has expired and cannot be transferred',
             10013: 'Original equipment package has expired and cannot be transferred',
             10014: 'Accept transfer of equipment packages that have not expired and cannot be transferred',
             10014: 'Accept transfer of equipment packages that have not expired and cannot be transferred',
+            10030: 'No purchase of cloud storage',
+            10031: 'The cloud storage has expired',
+            10032: 'The switched cloud storage package ID cannot be the same as the one in use',
             10033: 'The primary user of the device cannot purchase it',
             10033: 'The primary user of the device cannot purchase it',
             10034: 'Non device primary users cannot view cloud storage',
             10034: 'Non device primary users cannot view cloud storage',
             10035: 'Non device primary users cannot experience cloud storage',
             10035: 'Non device primary users cannot experience cloud storage',
@@ -161,7 +164,10 @@ class ResponseObject(object):
             10011: '接受转移设备不存在,无法转移',
             10011: '接受转移设备不存在,无法转移',
             10012: '体验套餐无法转移',
             10012: '体验套餐无法转移',
             10013: '原设备套餐已过期,无法转移',
             10013: '原设备套餐已过期,无法转移',
-            10014: '接受转移设备套餐未过期,无法转移' ,
+            10014: '接受转移设备套餐未过期,无法转移',
+            10030: '未购买云存',
+            10031: '云存已过期',
+            10032: '切换的云存套餐ID不能与正在使用中的相同',
             10033: '非设备主用户无法购买',
             10033: '非设备主用户无法购买',
             10034: '非设备主用户无法查看云存',
             10034: '非设备主用户无法查看云存',
             10035: '非设备主用户无法体验云存',
             10035: '非设备主用户无法体验云存',