|
@@ -55,6 +55,7 @@ from Object.m3u8generate import PlaylistGenerator
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
|
|
+from Object.utils.PayPalUtil import PayPalService
|
|
from Service.CommonService import CommonService
|
|
from Service.CommonService import CommonService
|
|
from Service.VodHlsService import SplitVodHlsObject
|
|
from Service.VodHlsService import SplitVodHlsObject
|
|
from Object.ApschedulerObject import ApschedulerObject
|
|
from Object.ApschedulerObject import ApschedulerObject
|
|
@@ -153,6 +154,8 @@ class testView(View):
|
|
return self.add_date_job(request_dict, response)
|
|
return self.add_date_job(request_dict, response)
|
|
elif operation == "del_apscheduler": # 删除定时任务
|
|
elif operation == "del_apscheduler": # 删除定时任务
|
|
return self.del_apscheduler_job(request_dict, response)
|
|
return self.del_apscheduler_job(request_dict, response)
|
|
|
|
+ elif operation == 'getPayPalTransactions': # 删除定时任务
|
|
|
|
+ return self.get_pay_pal_transactions(request_dict, response)
|
|
else:
|
|
else:
|
|
return response.json(414)
|
|
return response.json(414)
|
|
|
|
|
|
@@ -651,7 +654,8 @@ class testView(View):
|
|
'20230918061527058694',
|
|
'20230918061527058694',
|
|
'20230918062701462434']
|
|
'20230918062701462434']
|
|
for order_id in order_id_list:
|
|
for order_id in order_id_list:
|
|
- paypal_webhook_event_qs = PaypalWebHookEvent.objects.filter(~Q(trade_no=''), orderID=order_id).values('trade_no')
|
|
|
|
|
|
+ paypal_webhook_event_qs = PaypalWebHookEvent.objects.filter(~Q(trade_no=''), orderID=order_id).values(
|
|
|
|
+ 'trade_no')
|
|
if paypal_webhook_event_qs.exists():
|
|
if paypal_webhook_event_qs.exists():
|
|
trade_no = paypal_webhook_event_qs[0]['trade_no']
|
|
trade_no = paypal_webhook_event_qs[0]['trade_no']
|
|
Order_Model.objects.filter(orderID=order_id).update(trade_no=trade_no)
|
|
Order_Model.objects.filter(orderID=order_id).update(trade_no=trade_no)
|
|
@@ -1050,4 +1054,22 @@ class testView(View):
|
|
task_id = request_dict.get('task_id', None)
|
|
task_id = request_dict.get('task_id', None)
|
|
apscheduler_obj = ApschedulerObject()
|
|
apscheduler_obj = ApschedulerObject()
|
|
apscheduler_obj.del_job(task_id)
|
|
apscheduler_obj.del_job(task_id)
|
|
- return response.json(0)
|
|
|
|
|
|
+ return response.json(0)
|
|
|
|
+
|
|
|
|
+ @classmethod
|
|
|
|
+ def get_pay_pal_transactions(cls, request_dict, response):
|
|
|
|
+ from Ansjer.config import PAYPAL_CRD
|
|
|
|
+ try:
|
|
|
|
+ params = (
|
|
|
|
+ ('start_date', '2023-09-15T00:00:00-0800'),
|
|
|
|
+ ('end_date', '2023-09-15T23:59:59-0800'),
|
|
|
|
+ ('fields', 'all'),
|
|
|
|
+ ('page_size', '20'),
|
|
|
|
+ ('page', '1'),
|
|
|
|
+ )
|
|
|
|
+ result = PayPalService(PAYPAL_CRD['client_id'], PAYPAL_CRD['client_secret']).get_transactions(params)
|
|
|
|
+ return response.json(0, result)
|
|
|
|
+ except Exception as e:
|
|
|
|
+ LOGGER.info('UnicomManageControllerView.transfer_device_package, errLine:{}, errMsg:{}'.format(
|
|
|
|
+ e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
+ return response.json(500)
|