|
|
@@ -25,8 +25,8 @@ from django.utils.decorators import method_decorator
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
-from Ansjer.config import BASE_DIR
|
|
|
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD
|
|
|
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN, SERVER_DOMAIN, PAYPAL_CRD, \
|
|
|
+ SERVER_DOMAIN_SSL
|
|
|
from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
@@ -221,6 +221,7 @@ class CloudVodView(View):
|
|
|
nowTime = int(time.time())
|
|
|
# 新增流程
|
|
|
orderID = CommonService.createOrderID()
|
|
|
+
|
|
|
try:
|
|
|
aliPayObj = AliPayObject()
|
|
|
alipay = aliPayObj.conf()
|
|
|
@@ -229,8 +230,8 @@ class CloudVodView(View):
|
|
|
total_amount=price,
|
|
|
subject="测试哟",
|
|
|
# subject="实用性充气式玩具",
|
|
|
- return_url="https://test.dvema.com/cloudVod/payOK",
|
|
|
- notify_url="https://test.dvema.com/cloudVod/aliPayCallback"
|
|
|
+ return_url="{SERVER_DOMAIN_SSL}cloudVod/payOK".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL),
|
|
|
+ notify_url="{SERVER_DOMAIN_SSL}cloudVod/aliPayCallback".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
|
|
|
# return_url="http://192.168.136.40/cloudVod/payOK",
|
|
|
# notify_url="http://192.168.136.40/cloudVod/aliPayCallback"
|
|
|
)
|
|
|
@@ -577,7 +578,6 @@ class CloudVodView(View):
|
|
|
OssCrdModel.objects.create(uid=UID, channel=channel, data=json.dumps(res), addTime=now_time)
|
|
|
return JsonResponse(status=200, data=res)
|
|
|
|
|
|
-
|
|
|
def do_paypal_execute(self, request_dict, response):
|
|
|
paymentId = request_dict.get('paymentId', None)
|
|
|
PayerID = request_dict.get('PayerID', None)
|
chenjunkai