1

src/main/java/com/fdkankan/pay/controller/AutopayOrderController.java

@@ -4,10 +4,7 @@ package com.fdkankan.pay.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.pay.common.ResultCode;
 import com.fdkankan.pay.common.ResultData;
-import com.fdkankan.pay.entity.AutopayOrder;
-import com.fdkankan.pay.entity.Order;
-import com.fdkankan.pay.entity.PaypalConfig;
-import com.fdkankan.pay.entity.PaypalWebhookLog;
+import com.fdkankan.pay.entity.*;
 import com.fdkankan.pay.exception.BusinessException;
 import com.fdkankan.pay.service.*;
 import com.fdkankan.pay.util.CacheUtil;
@@ -103,17 +100,22 @@ public class AutopayOrderController {
         log.setStatus(1);
         paypalWebhookLogService.updateById(log);
 
-        String orderSnSon = null;
+        AutopayOrderSon orderSnSon = null;
         if("PAYMENT.SALE.COMPLETED".equals(event_type)){
             orderSnSon = autopayOrderSonService.addOrderByOrder(autopayOrder.getId(),resource);
         }
         HashMap<String,String >map = new HashMap<>();
         map.put("subscriptionOrderSn",orderSn);
         map.put("subscriptionId",subscriptionId);
-        map.put("orderSn",orderSnSon );
         map.put("eventType",event_type);
         map.put("tradeNo",tradeNo);
         map.put("state",state);
+        map.put("orderSn",null);
+        map.put("amount",null);
+        if(orderSnSon != null){
+            map.put("orderSn",orderSnSon.getOrderSn() );
+            map.put("amount",orderSnSon.getAmount());
+        }
 
         rabbitMqProducer.sendByWorkQueue(CacheUtil.autoPaypalQueue,map);
         return ResultData.ok();

src/main/java/com/fdkankan/pay/service/IAutopayOrderSonService.java

@@ -15,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAutopayOrderSonService extends IService<AutopayOrderSon> {
 
-    String addOrderByOrder(Integer id , JSONObject resource);
+    AutopayOrderSon addOrderByOrder(Integer id , JSONObject resource);
 }

src/main/java/com/fdkankan/pay/service/impl/AutopayOrderSonServiceImpl.java

@@ -26,7 +26,7 @@ public class AutopayOrderSonServiceImpl extends ServiceImpl<IAutopayOrderSonMapp
     OrderSnUtil orderSnUtil;
 
     @Override
-    public String addOrderByOrder(Integer autoPayOrderId, JSONObject resource ) {
+    public AutopayOrderSon addOrderByOrder(Integer autoPayOrderId, JSONObject resource ) {
         String state =resource.getString("state");
         String tradeNo = resource.getString("id");
         JSONObject amountObj = resource.getJSONObject("amount");
@@ -41,6 +41,6 @@ public class AutopayOrderSonServiceImpl extends ServiceImpl<IAutopayOrderSonMapp
         autopayOrderSon.setAmount(amount);
         autopayOrderSon.setCurrency(currency);
         this.save(autopayOrderSon);
-        return autopayOrderSon.getOrderSn();
+        return autopayOrderSon;
     }
 }