Browse Source

修改记录钩子订阅行为

lang 3 years ago
parent
commit
9349ee8383
1 changed files with 2 additions and 22 deletions
  1. 2 22
      Controller/PaymentCycle.py

+ 2 - 22
Controller/PaymentCycle.py

@@ -360,17 +360,7 @@ class PaypalCycleNotify(View):
             billing_agreement = paypalrestsdk.BillingAgreement.find(agreement_id)
             logger.info(type(billing_agreement))
             # 记录钩子日志
-            PaypalWebHookEventInsert = {
-                'webhook_event_id': json_obj.get('id'),
-                'resource_type': json_obj.get('resource_type'),
-                'event_type': 1,
-                'summary': summary,
-                'agreement_id': billing_agreement_id,
-                'trade_no': paypal_transaction_id,
-                'resource': json_agreement_str,
-                'created_time': int(time.time()),
-                'agreement_desc':  json.dumps(billing_agreement),
-            }
+            PaypalWebHookEventInsert['agreement_desc'] = json.dumps(billing_agreement.__dict__)
             PaypalWebHookEvent.objects.create(**PaypalWebHookEventInsert)
 
             # 订阅续费订单(如果完成周期数`==0,则是自动续费第一次扣款。否则说明是续费订单)
@@ -580,17 +570,7 @@ class PaypalCycleNotify(View):
             agreement_id = paypal_body.get('billing_agreement_id')
             billing_agreement = paypalrestsdk.BillingAgreement.find(agreement_id)
             # 记录钩子日志
-            PaypalWebHookEventInsert = {
-                'webhook_event_id': json_obj.get('id'),
-                'resource_type': json_obj.get('resource_type'),
-                'event_type': event_type_code,
-                'summary': summary,
-                'agreement_id': billing_agreement_id,
-                'trade_no': paypal_transaction_id,
-                'resource': json_agreement_str,
-                'created_time': int(time.time()),
-                'agreement_desc': json.dumps(billing_agreement),
-            }
+            PaypalWebHookEventInsert['agreement_desc'] = json.dumps(billing_agreement.__dict__)
             PaypalWebHookEvent.objects.create(**PaypalWebHookEventInsert)
             return HttpResponse('success')