测试取消订单

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -68,10 +68,6 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/order/orderCancel"})
     Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param);
 
-    @PostMapping(value = {"clx-performance/feign/order/ownCancelOrderPre"})
-    Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param);
-
-
     /**
      * 更新货单暂停标志
      * @param orderNo

performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java

+package com.clx.performance.feign;
+
+import com.clx.performance.param.pc.OrderCancelParam;
+import com.msl.common.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "clx-performance", configuration = PerformanceClientConfiguration.class)
+public interface PerformanceSDKFeign {
+
+
+    @PostMapping(value = {"clx-performance/feign/sdk/ownCancelOrderPre"})
+    Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param);
+
+}

performance-web/src/main/java/com/clx/performance/controller/feign/OrderCancelFeignController.java

@@ -34,11 +34,4 @@ public class OrderCancelFeignController {
         return Result.ok();
     }
 
-    @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
-    @PostMapping("/ownCancelOrderPre")
-    public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
-        log.info("取消订单参数：{}", TokenUtil.getLoginUserInfo());
-        //orderCancelService.ownerCancelOrderPre(param);
-        return Result.ok();
-    }
 }

performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.param.pc.OrderCancelParam;
+import com.msl.common.result.Result;
+import com.msl.user.utils.TokenUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+
+@Slf4j
+@RestController
+@RequestMapping("/feign/sdk")
+@Validated
+@Api(tags = "对外sdk Feign")
+@AllArgsConstructor
+public class PerformanceSdkFeignController {
+
+
+
+    @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownCancelOrderPre")
+    public Result<String> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+        log.info("取消订单参数：{}", TokenUtil.getLoginUserInfo());
+        //orderCancelService.ownerCancelOrderPre(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderCancelResidueWeight")
+    public Result<String> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
+        log.info("当前订单可取消吨数参数：{}", TokenUtil.getLoginUserInfo());
+        //orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
+        return Result.ok(new BigDecimal(100).toString());
+    }
+}