Переглянути джерело

支付成功才发mq处理业务

lyhzzz 1 рік тому
батько
коміт
d734456d19

+ 1 - 1
src/main/java/com/fdkankan/pay/service/impl/OrderServiceImpl.java

@@ -73,7 +73,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
 
     @Override
     public void payResult(Order order, Boolean payFlag, String trade_no,String openId) {
-        if(order.getPayStatus() != 0){
+        if(order.getPayStatus() != 0 && payFlag){
             return;
         }
         order.setPayStatus(payFlag ? 1:2);

+ 2 - 2
src/main/java/com/fdkankan/pay/util/paypal/restApi/RestApiPaypalService.java

@@ -309,7 +309,7 @@ public class RestApiPaypalService {
         paypalConfig.setClientId("AZJEGWlvvI2q52bR4k_mC1ftW8tEnlaJj30huGQTBsdAjwmKlMDiEiMixVKbfrdw6fB55NSj_BAE8FPP");
         paypalConfig.setSecret("EL-RGNmsbFpcKT7QuIlxMxX7MQplp8rCyaGDZ5KOCMQ9BkOhY5OYZyVInAeHT8_4tXoPth8tOEZY_3s_");
         getWebhook(paypalConfig);
-        deleteWebhook(paypalConfig,"6W6264298X616180C");
+        //deleteWebhook(paypalConfig,"2EY327684A754064J");
         createWebhook(paypalConfig);
     }
 
@@ -318,7 +318,7 @@ public class RestApiPaypalService {
             Map<String,String> map = new HashMap<>(4);
             map.put("Content-Type","application/json");
             WebhookVo webhookVo = new WebhookVo();
-            webhookVo.setUrl("https://testeur.4dkankan.com/service/pay/paypal/webhook");
+            webhookVo.setUrl("https://eur.4dkankan.com/service/pay/paypal/webhook");
             webhookVo.getEvent_types().add(new EventTypeVo("PAYMENT.SALE.COMPLETED"));
             webhookVo.getEvent_types().add(new EventTypeVo("CATALOG.PRODUCT.CREATED"));
             webhookVo.getEvent_types().add(new EventTypeVo("BILLING.PLAN.CREATED"));