取消订阅

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

@@ -121,13 +121,13 @@ public class AutopayOrderController {
         return ResultData.ok();
     }
 
-    @GetMapping("/cancel/{orderSn}")
-    public ResultData cancel(@PathVariable String orderSn){
-        AutopayOrder autopayOrder = autopayOrderService.getByOrderSn(orderSn);
+    @GetMapping("/cancel/{subscriptionId}")
+    public ResultData cancel(@PathVariable String subscriptionId){
+        AutopayOrder autopayOrder = autopayOrderService.getBySubscriptionId(subscriptionId);
         if(autopayOrder == null){
             throw new BusinessException(ResultCode.ORDER_NOT_EXIST);
         }
-        Order order = orderService.getByOrderSn(orderSn);
+        Order order = orderService.getByOrderSn(autopayOrder.getOrderSn());
         if(order == null){
             throw new BusinessException(ResultCode.ORDER_NOT_EXIST);
         }
@@ -135,7 +135,7 @@ public class AutopayOrderController {
         if(paypalConfig == null){
             throw new BusinessException(ResultCode.PAYPAL_CONFIG_ERROR);
         }
-        restApiPaypalService.cancelSubscriptions(paypalConfig,autopayOrder.getSubscriptionId());
+        RestApiPaypalService.cancelSubscriptions(paypalConfig,autopayOrder.getSubscriptionId());
         return ResultData.ok();
     }
 }

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

@@ -284,7 +284,7 @@ public class RestApiPaypalService {
     /**
      * 取消订阅
      */
-    public  void cancelSubscriptions(PaypalConfig paypalConfig, String subscriptionsId) {
+    public static void cancelSubscriptions(PaypalConfig paypalConfig, String subscriptionsId) {
         log.info("cancelSubscriptions-request:{}",subscriptionsId);
         Map<String,String> map = new HashMap<>(4);
         map.put("Content-Type","application/json");
@@ -308,9 +308,7 @@ public class RestApiPaypalService {
         paypalConfig.setClientId("ATzzbHdy4kgJxUJegzDbBO1kRUE5kcur5VXaNtja4JDpLsfPokdlKAtunTVa_mWPcTQTMy06JAW6Ae5j");
         paypalConfig.setSecret("EPBsjKmNHHrmu0joNkWcrVpdqXTs3pow5jRdD1daOMyomteOxHMUDXhsM6Z-bjMi8MfSMB4iIyuhIihV");
 
-        deleteWebhook(paypalConfig,"34G17460TH6654649");
-        getWebhook(paypalConfig);
-        createWebhook(paypalConfig);
+        cancelSubscriptions(paypalConfig,"");
     }
 
     public static void createWebhook(PaypalConfig paypalConfig){