vsees云存

Controller/PaymentCycle.py

@@ -405,21 +405,18 @@ class PaypalCycleNotify(View):
                 PAY_LOGGER.info('----event_type异常:{}----'.format(event_type))
 
             if resource_type == 'sale' and paypal_body.get('state') == 'completed':
-                temp_order = Order_Model.objects.filter(trade_no=paypal_transaction_id).values('app_type')
-                if not temp_order.exists():
-                    PAY_LOGGER.info('PayPal周期扣款失败---根据trade_no查询订单数据不存在')
-                    return HttpResponse('Fail', status=500)
-                app_type = temp_order[0]['app_type']
-                if app_type == 1:
-                    paypalrestsdk.configure(PAYPAL_CRD['Zosi'])
-                elif app_type == 2:
-                    paypalrestsdk.configure(PAYPAL_CRD['Vsees'])
+                paypalrestsdk.configure(PAYPAL_CRD['Zosi'])
                 response = paypalrestsdk.WebhookEvent.verify(
                     transmission_id, transmission_time, PAYPAL_WEB_HOOK_ID, json_agreement_str, cert_url,
                     transmission_sig, auth_algo)
                 if not response:
-                    PAY_LOGGER.info('PayPal周期扣款失败---签名验证失败')
-                    return HttpResponse('Fail', status=500)
+                    paypalrestsdk.configure(PAYPAL_CRD['Vsees'])
+                    response = paypalrestsdk.WebhookEvent.verify(
+                        transmission_id, transmission_time, PAYPAL_WEB_HOOK_ID, json_agreement_str, cert_url,
+                        transmission_sig, auth_algo)
+                    if not response:
+                        PAY_LOGGER.info('PayPal周期扣款失败---签名验证失败')
+                        return HttpResponse('Fail', status=500)
             else:
                 PAY_LOGGER.info('PayPal周期扣款失败,付款状态有误,resource_type:{},state:{}----'.
                                 format(resource_type, paypal_body.get('state')))
@@ -718,21 +715,21 @@ class PaypalCycleNotify(View):
             amount = paypal_body.get('amount')
 
             # self.get_plan_desc('P-4CG284532S612303METMEINY')
-            temp_order = Order_Model.objects.filter(trade_no=paypal_transaction_id).values('app_type')
-            if not temp_order.exists():
-                return HttpResponse('Fail', status=500)
-            app_type = temp_order[0]['app_type']
-            if app_type == 1:
-                paypalrestsdk.configure(PAYPAL_CRD['Zosi'])
-            elif app_type == 2:
-                paypalrestsdk.configure(PAYPAL_CRD['Vseees'])
+            paypalrestsdk.configure(PAYPAL_CRD['Zosi'])
             response = paypalrestsdk.WebhookEvent.verify(
                 transmission_id, transmission_time, PAYPAL_WEB_HOOK_ID_TWO, json_agreement_str, cert_url,
                 transmission_sig, auth_algo)
             logger.info('----验证签名----')
             logger.info(response)
             if not response:
-                return HttpResponse('Fail', status=500)
+                paypalrestsdk.configure(PAYPAL_CRD['Vsees'])
+                response = paypalrestsdk.WebhookEvent.verify(
+                    transmission_id, transmission_time, PAYPAL_WEB_HOOK_ID_TWO, json_agreement_str, cert_url,
+                    transmission_sig, auth_algo)
+                logger.info('----验证签名----')
+                logger.info(response)
+                if not response:
+                    return HttpResponse('Fail', status=500)
             event_type_code = 0
             billing_agreement_id = ''
             if event_type == 'PAYMENT.SALE.COMPLETED':