lyhzzz 1 anno fa
parent
commit
a78451febd

+ 1 - 1
src/main/java/com/fdkankan/pay/controller/AutopayOrderController.java

@@ -84,7 +84,7 @@ public class AutopayOrderController {
         }
         }
         autopayOrder = autopayOrderService.getBySubscriptionId(subscriptionId);
         autopayOrder = autopayOrderService.getBySubscriptionId(subscriptionId);
         if(autopayOrder == null){
         if(autopayOrder == null){
-            AutopayOrderController.log.info("webhook-error:{},订阅Id:{}","订单不存在",subscriptionId);
+            AutopayOrderController.log.info("webhook-error:{},event:{},订阅Id:{}","订单不存在",event_type,subscriptionId);
             return ResultData.ok();
             return ResultData.ok();
         }
         }
         String orderSn = autopayOrder.getOrderSn();
         String orderSn = autopayOrder.getOrderSn();

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

@@ -214,10 +214,11 @@ public class RestApiPaypalService {
         SubscriptionDTO subscriptionDTO = new SubscriptionDTO();
         SubscriptionDTO subscriptionDTO = new SubscriptionDTO();
         subscriptionDTO.setPlanId(order.getPlanId());
         subscriptionDTO.setPlanId(order.getPlanId());
         subscriptionDTO.setStartTime(order.getStartTime());
         subscriptionDTO.setStartTime(order.getStartTime());
-        ShippingAmount amount = new ShippingAmount();
-        amount.setCurrencyCode("USD");
-        amount.setValue(order.getOrderMoney().toString());
-        subscriptionDTO.setShippingAmount(amount);
+//        ShippingAmount amount = new ShippingAmount();
+//        amount.setCurrencyCode("USD");
+//        amount.setValue(order.getOrderMoney().toString());
+//        subscriptionDTO.setShippingAmount(amount);
+        subscriptionDTO.setQuantity("1");
 
 
         Subscriber subscriber = new Subscriber();
         Subscriber subscriber = new Subscriber();
         SubscriberName subscriberName = new SubscriberName();
         SubscriberName subscriberName = new SubscriberName();