chenjunkai 6 ani în urmă
părinte
comite
f55f184263
3 a modificat fișierele cu 11 adăugiri și 3 ștergeri
  1. 8 1
      Controller/CloudVod.py
  2. 2 1
      Controller/DetectController.py
  3. 1 1
      Object/TokenObject.py

+ 8 - 1
Controller/CloudVod.py

@@ -243,6 +243,13 @@ class CloudVodView(View):
                 # return_url="http://192.168.136.40/cloudVod/payOK",
                 # notify_url="http://192.168.136.40/cloudVod/aliPayCallback"
             )
+            app_pay = alipay.api_alipay_trade_app_pay(
+                out_trade_no=orderID,
+                total_amount=price,
+                subject="oeo",
+                return_url="https://test.dvema.com/cloudVod/payOK",
+                notify_url="https://test.dvema.com/cloudVod/aliPayCallback"
+            )
             # order_string = alipay.api_alipay_trade_page_pay(
             #     out_trade_no=orderID,
             #     total_amount=price,
@@ -260,7 +267,7 @@ class CloudVodView(View):
                                        price=price, currency=currency, addTime=nowTime, updTime=nowTime,
                                        endTime=nowTime + int(day) * 3600 * 24, rank_id=rank, paypal='', payType=1)
             return JsonResponse(status=200,
-                                data={'result_code': 0, 'reason': 'success', 'result': {"redirectUrl": redirectUrl},
+                                data={'result_code': 0, 'reason': 'success', 'result': {"redirectUrl": redirectUrl,"appPay":app_pay},
                                       'error_code': 0})
         else:
             return response.json(10, '生成订单错误')

+ 2 - 1
Controller/DetectController.py

@@ -34,7 +34,7 @@ from django.http import JsonResponse
 from Service.CommonService import CommonService
 
 
-# http://192.168.136.40:8077/detect/changeStatus?uid=JW3684H8BSHG9TTM111A&token_val=18071adc03536302f34&appBundleId=com.ansjer.zccloud_ab&push_type=2&token=local&status=1
+# http://192.168.136.40:8077/detect/changeStatus?uid=JW3684H8BSHG9TTM111A&token_val=18071adc03536302f34&appBundleId=com.ansjer.zccloud_ab&push_type=2&token=local&status=1&app_type=1
 class DetectControllerView(View):
     @method_decorator(csrf_exempt)
     def dispatch(self, *args, **kwargs):
@@ -155,6 +155,7 @@ class DetectControllerView(View):
 
 
 # http://192.168.136.40:8077/notify/push?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiJUTjdNUEUzMjExVUU3NkFQMTExQSJ9.k501567VdnhFpn_ygzGRDat3Kqlz5CsEA9jAC2dDk_g&obj=12341234&n_time=1234561234
+# http://test.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJQMldOR0pSRDJFSEE1RVU5MTExQSJ9.xOCI5lerk8JOs5OcAzunrKCfCrtuPIZ3AnkMmnd-bPY&n_time=1526845794&channel=1&event_type=51&is_st=0
 # 移动侦测接口
 class NotificationView(View):
 

+ 1 - 1
Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
     def __init__(self, token=None):
         if token == 'local':
-            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1NTQ3MTQ2OTJ9.jMVRK8GtkZsTfypykBKOHL7Kyxf3BCs0_FQpmK6fAis'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NTU5MDQ5MjF9.LG-wlg7ttQOI66QoEFD7CWaO5XwwZNaujceLgiMGxts'
         if token == 'test':
             token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJsYW5nIjoiZW4iLCJleHAiOjE1NTI2MTIxOTF9.sO8BtSclN6B-qwqNmYWbICatHYEtyMdoqzZ0hcOSsmg'
         self.token = token