添加钩子id

Ansjer/eur_config/config_formal.py

@@ -29,8 +29,8 @@ PAYPAL_CRD = {
     "client_id": "AVLoQVq3xHZ6FrF4mxHwlCPgVBAw4Fw5RtMkuxmYd23SkUTIY643n2g3KdK-Al8wV05I28lza5uoQbAA",
     "client_secret": "EO8kRc8yioDk0i2Qq-QMcVFfwkmyMJorTvBSLDTnxDJJ_wb9VoM_0jkUY9iEng2Flp1ze8wQOGpH5nB2"
 }
-PAYPAL_WEB_HOOK_ID = '6TS30758D98835230'
-PAYPAL_WEB_HOOK_ID_TWO = '2BH56575UJ9324151'
+PAYPAL_WEB_HOOK_ID = '3YH86681TH784461T'
+PAYPAL_WEB_HOOK_ID_TWO = '7TN87895N70389928'
 
 
 DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'

Ansjer/us_config/config_formal.py

@@ -25,7 +25,7 @@ PAYPAL_CRD = {
     "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
 }
 PAYPAL_WEB_HOOK_ID = '3YH86681TH784461T'
-PAYPAL_WEB_HOOK_ID_TWO = '2BH56575UJ9324151'
+PAYPAL_WEB_HOOK_ID_TWO = '7TN87895N70389928'
 
 # PAYPAL_CRD = {
 #     "mode": "sandbox",  # sandbox or live

Controller/PaymentCycle.py

@@ -538,8 +538,10 @@ class PaypalCycleNotify(View):
                 event_type_code = 3
             elif event_type == 'BILLING.SUBSCRIPTION.SUSPENDED':
                 event_type_code = 4
-            elif event_type == 'Subscription payment failed':
+            elif event_type == 'BILLING.SUBSCRIPTION.PAYMENT.FAILED':
                 event_type_code = 5
+            elif event_type == 'PAYMENT.SALE.REFUNDED':
+                event_type_code = 6
 
             PaypalWebHookEventInsert = {
                 'webhook_event_id': json_obj.get('id'),

Model/models.py

@@ -2282,7 +2282,8 @@ class PaypalWebHookEvent(models.Model):
     webhook_event_id = models.CharField(max_length=200, blank=True, verbose_name='webhook事件ID', default='')
     resource_type = models.CharField(max_length=11, verbose_name='资源类型', blank=True, default='')
     ## event_type: 1=PAYMENT.SALE.COMPLETED(付款，订阅成功后钩子)，2=PAYMENT.SALE.REVERSED（付款撤销）
-    ## event_type: 3=BILLING.SUBSCRIPTION.CANCELLED（订阅取消），4=BILLING.SUBSCRIPTION.SUSPENDED（订阅暂停），5=Subscription payment failed（订阅付款失败）
+    ## event_type: 3=BILLING.SUBSCRIPTION.CANCELLED（订阅取消），4=BILLING.SUBSCRIPTION.SUSPENDED（订阅暂停），
+    # event_type:  5=BILLING.SUBSCRIPTION.PAYMENT.FAILED（订阅付款失败），6=PAYMENT.SALE.REFUNDED（退款）
     event_type = models.SmallIntegerField(default=0, verbose_name='事件类型')
     summary = models.CharField(max_length=500, verbose_name='事件概要', blank=True, default='')
     agreement_id = models.CharField(max_length=22, db_index=True, verbose_name='订阅ID', blank=True, default='')