lang 4 жил өмнө
parent
commit
633891dcc0

+ 4 - 2
Controller/CloudStorage.py

@@ -909,6 +909,8 @@ class CloudStorageView(View):
         channel = request_dict.get('channel', None)
         commodity_code = request_dict.get('commodity_code', None)
         pay_type = int(request_dict.get('pay_type', None))
+        rank = request_dict.get('rank', None)
+
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1)
         if not dv_qs.exists():
             return response.json(12)
@@ -959,7 +961,7 @@ class CloudStorageView(View):
                                                desc=content, payType=pay_type, payTime=nowTime,
                                                price=price, currency=currency, addTime=nowTime, updTime=nowTime,
                                                endTime=(nowTime + int(day) * 3600 * 24), pay_url=approval_url,
-                                               commodity_code=commodity_code, commodity_type=commodity_type)
+                                               commodity_code=commodity_code, commodity_type=commodity_type,rank_id=rank)
                     return response.json(0, {"redirectUrl": approval_url, "orderID": orderID})
             return response.json(10, 'generate_order_false')
         else:
@@ -987,7 +989,7 @@ class CloudStorageView(View):
                                                desc=content, payType=pay_type, payTime=nowTime,
                                                price=price, currency=currency, addTime=nowTime, updTime=nowTime,
                                                endTime=(nowTime + int(day) * 3600 * 24), pay_url=redirectUrl,
-                                               commodity_code=commodity_code, commodity_type=commodity_type)
+                                               commodity_code=commodity_code, commodity_type=commodity_type,rank_id=rank)
                     return JsonResponse(status=200, data={'result_code': 0, 'reason': 'success',
                                                           'result': {"redirectUrl": redirectUrl, "orderID": orderID},
                                                           'error_code': 0})

+ 5 - 5
Controller/TestApi.py

@@ -679,11 +679,11 @@ class testView(View):
 
     def generate_token(self,request_dict,userID):
         #UserIdToken
-        # tko = TokenObject()
-        # res = tko.generate(
-        #     data={'userID': 158943604783713800138000, 'lang': 'cn', 'user': '13527261476', 'm_code': '123413243214'})
+        tko = TokenObject()
+        res = tko.generate(
+            data={'userID': 158943604783713800138000, 'lang': 'cn', 'user': '13527261476', 'm_code': '123413243214'})
 
         #uidToken
-        utko = UidTokenObject()
-        res = utko.generate(data={'uid':'86YC8Z192VB1VMKU111A','channel':1})
+        # utko = UidTokenObject()
+        # res = utko.generate(data={'uid':'86YC8Z192VB1VMKU111A','channel':1})
         return JsonResponse(status=200, data=res,safe=False)