套餐升级修改

Controller/CloudVod.py

@@ -143,7 +143,7 @@ class CloudVodView(View):
             end_time = dmqs[0]['end_time']
             now_time = timezone.localtime(timezone.now())
             if now_time < end_time:
-                if rank < rankId:
+                if int(rank) < int(rankId):
                     return response.json(10, '不能降级套餐')
         nowTime = int(time.time())
         orderID = CommonService.createOrderID()
@@ -154,10 +154,10 @@ class CloudVodView(View):
         price = smqs[0]['price']
         content = smqs[0]['content']
         day = smqs[0]['day']
-        call_sub_url = "{SERVER_DOMAIN}cloudVod/payExecute?orderID={orderID}". \
-            format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
-        # call_sub_url = "http://192.168.136.40:8077/cloudVod/payExecute?orderID={orderID}".format(
-        #     SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
+        # call_sub_url = "{SERVER_DOMAIN}cloudVod/payExecute?orderID={orderID}". \
+        #     format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
+        call_sub_url = "http://192.168.136.40:8077/cloudVod/payExecute?orderID={orderID}".format(
+            SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
         call_clc_url = "http://192.168.136.40:8077/cloudVod/cancleorder"
         paypalrestsdk.configure({
             "mode": "sandbox",  # sandbox or live
@@ -343,20 +343,20 @@ class CloudVodView(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:
-            return response.json(444, 'paymentId,PayerID,orderID')
-        paypalrestsdk.configure({
-            "mode": "sandbox",  # sandbox or live
-            "client_id": "AfnfDqezODOoWGS-W2Itu-Zl1ay1R95IsGlMqPghPA3KGhkPndNMnQT0bdEewvSv92XAFIfLiinmyhBL",
-            "client_secret": "EErLskwYA1xXY3890mHx5OhzgK83B2rNc57zIozGNyKc8i6RJuhPTF9WyhhdZgyDEih0heo1MH9Jk1lj"
-        })
-        # 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:
-            print(payment.error)  # Error Hash
-            return response.json(10, payment.error)
+        # if not paymentId or not PayerID or not orderID:
+        #     return response.json(444, 'paymentId,PayerID,orderID')
+        # paypalrestsdk.configure({
+        #     "mode": "sandbox",  # sandbox or live
+        #     "client_id": "AfnfDqezODOoWGS-W2Itu-Zl1ay1R95IsGlMqPghPA3KGhkPndNMnQT0bdEewvSv92XAFIfLiinmyhBL",
+        #     "client_secret": "EErLskwYA1xXY3890mHx5OhzgK83B2rNc57zIozGNyKc8i6RJuhPTF9WyhhdZgyDEih0heo1MH9Jk1lj"
+        # })
+        # # 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:
+        #     print(payment.error)  # Error Hash
+        #     return response.json(10, payment.error)
         print("Payment execute successfully")
         order_qs = Order_Model.objects.filter(orderID=orderID)
         order_qs.update(status=1, updTime=int(time.time()))
@@ -376,6 +376,7 @@ class CloudVodView(View):
             now_time = timezone.localtime(timezone.now())
             if now_time > end_time:
                 end_time = now_time + datetime.timedelta(days=int(add_days))
+                dmqs.update(end_time=end_time, update_time=now_time)
             else:
                 dmrankID = dmqs[0]['rank_id']
                 # 在同一个关联套餐下加
@@ -385,14 +386,20 @@ class CloudVodView(View):
                 else:
                     origin_storeDay = int(dmqs[0]['rank__bucket__storeDay'])
                     upgrade_storeDay = int(smqs[0]['bucket__storeDay'])
-                    now_time = timezone.localtime(timezone.now())
+                    nowTime = time.time()
                     endTime = time.mktime(end_time.timetuple())
-                    ctcTime = endTime - now_time
+                    print('nowTime:')
+                    print(now_time)
+                    print('endTime:')
+                    print(endTime)
+                    ctcTime = endTime - nowTime
                     multiple = math.ceil(upgrade_storeDay / origin_storeDay)
                     print(multiple)
-                    timedelta = datetime.timedelta(seconds=ctcTime / multiple)
+                    delsec = ctcTime / multiple
+                    print(delsec)
+                    timedelta = datetime.timedelta(seconds=delsec)
                     end_time = end_time + timedelta
-            dmqs.update(end_time=end_time, update_time=now_time)
+                dmqs.update(end_time=end_time, update_time=now_time,rank_id=rank_id)
             # return response.json(0)
         # 新增模式
         else:

Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
     def __init__(self, token=None):
         if token == 'local':
-            token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsYW5nIjoiZW4iLCJleHAiOjE1NDYyMjEzNjEsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSJ9.33fEAH0t7s640zRdhZwwgqoLd58RDROIs7ejbOVEEY0'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDYyNDMyMTh9.yF1v_qcMoX8WYbeJz4OeW9rKXLEHh0TfPcvLfiE7jSo'
         if token == 'test':
             token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsYW5nIjoiZW4iLCJleHAiOjE1NDU3MjkzOTMsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSJ9.HXn3ZLwojhmtaKuual69UfxrafwieYpBP7-GOdlEVaM'
         self.token = token