1

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

@@ -132,7 +132,7 @@ public class StripeController {
         String state = AutoPayUtil.getState(status);
 
         if(orderId != null){
-            autopayOrder = autopayOrderService.getByOrderSn(orderId);
+            autopayOrder = autopayOrderService.getByOrderSn(orderId,6);
             if(autopayOrder == null ){
                 return ResultData.ok();
             }

src/main/java/com/fdkankan/pay/entity/AutopayOrder.java

@@ -60,5 +60,10 @@ public class AutopayOrder implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    /**
+     * 商品Id
+     */
+    @TableField("pay_type")
+    private Integer payType;
 
 }

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

@@ -13,9 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAutopayOrderService extends IService<AutopayOrder> {
 
-     AutopayOrder getByOrderSn(String orderSn) ;
+     AutopayOrder getByOrderSn(String orderSn,Integer payType) ;
 
-     void saveAutoOrder(String orderSn, String productId, String planId, String subscriptionId,String webUrl);
+     void saveAutoOrder(String orderSn, String productId, String planId, String subscriptionId,String webUrl,Integer payType);
 
      AutopayOrder getBySubscriptionId(String subscriptionId);
 

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

@@ -21,20 +21,22 @@ import org.springframework.stereotype.Service;
 public class AutopayOrderServiceImpl extends ServiceImpl<IAutopayOrderMapper, AutopayOrder> implements IAutopayOrderService {
 
     @Override
-    public void saveAutoOrder(String orderSn, String productId, String planId, String subscriptionId,String webUrl) {
+    public void saveAutoOrder(String orderSn, String productId, String planId, String subscriptionId,String webUrl,Integer payType) {
         AutopayOrder autopayOrder = new AutopayOrder();
         autopayOrder.setOrderSn(orderSn);
         autopayOrder.setProductId(productId);
         autopayOrder.setPlanId(planId);
         autopayOrder.setSubscriptionId(subscriptionId);
         autopayOrder.setSubscriptionHref(webUrl);
+        autopayOrder.setPayType(payType);
         this.save(autopayOrder);
     }
 
     @Override
-    public AutopayOrder getByOrderSn(String orderSn) {
+    public AutopayOrder getByOrderSn(String orderSn,Integer payType) {
         LambdaQueryWrapper<AutopayOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AutopayOrder::getOrderSn,orderSn);
+        wrapper.eq(AutopayOrder::getPayType,payType);
         return this.getOne(wrapper);
     }
 

src/main/java/com/fdkankan/pay/util/paypal/sdk/PaypalService.java

@@ -448,7 +448,7 @@ public class PaypalService {
     IAutopayPlanService autopayPlanService;
 
     public Object autoPay(Order order, PaypalConfig paypalConfig) {
-        AutopayOrder autopayOrder = autopayOrderService.getByOrderSn(order.getOrderSn());
+        AutopayOrder autopayOrder = autopayOrderService.getByOrderSn(order.getOrderSn(),order.getPayType());
 
         OpenPayResponse openPayResponse = new OpenPayResponse();
         openPayResponse.setOrderSn(order.getOrderSn());
@@ -514,7 +514,7 @@ public class PaypalService {
 
         SubscriptionVo subscription = restApiPaypalService.createSubscription(paypalConfig, order);
         log.info("创建订阅支付链接："+subscription);
-        autopayOrderService.saveAutoOrder(order.getOrderSn(),autopayPlan.getProductId(),autopayPlan.getPlanId(),subscription.getSubscriptionId(),subscription.getSubscriptionHref());
+        autopayOrderService.saveAutoOrder(order.getOrderSn(),autopayPlan.getProductId(),autopayPlan.getPlanId(),subscription.getSubscriptionId(),subscription.getSubscriptionHref(),order.getPayType());
 
         openPayResponse.setH5Url(subscription.getSubscriptionHref());
         openPayResponse.setQrCodeUrl(subscription.getSubscriptionHref());

src/main/java/com/fdkankan/pay/util/stripe/StripeService.java

@@ -64,7 +64,7 @@ public class StripeService {
             openPayResponse.setOrderSn(param.getOrderSn());
             openPayResponse.setPayType(6);
             if(param.getAutoPay() == 1){
-                AutopayOrder autopayOrder = autopayOrderService.getByOrderSn(param.getOrderSn());
+                AutopayOrder autopayOrder = autopayOrderService.getByOrderSn(param.getOrderSn(),param.getPayType());
                 openPayResponse.setAutoPay(1);
                 if(autopayOrder !=null){
                     openPayResponse.setH5Url(autopayOrder.getSubscriptionHref());
@@ -113,7 +113,7 @@ public class StripeService {
             openPayResponse.setQrCodeUrl(session.getUrl());
 
             if(param.getAutoPay() == 1){
-                autopayOrderService.saveAutoOrder(param.getOrderSn(),productId,priceId,null,session.getUrl());
+                autopayOrderService.saveAutoOrder(param.getOrderSn(),productId,priceId,null,session.getUrl(),param.getPayType());
             }
             return openPayResponse;