货主取消订单、获取当前订单可取消吨数

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

@@ -2,6 +2,8 @@ package com.clx.performance.controller.feign;
 
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
+import com.clx.performance.service.OrderCancelService;
+import com.clx.performance.service.OrderGoodsService;
 import com.msl.common.result.Result;
 import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
@@ -22,12 +24,16 @@ import java.math.BigDecimal;
 public class PerformanceSdkFeignController {
 
 
+    private final OrderCancelService orderCancelService;
+
+    private final OrderGoodsService orderGoodsService;
+
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
     public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
         log.info("取消订单参数：{}", TokenUtil.getLoginUserInfo());
-        //orderCancelService.ownerCancelOrderPre(param);
+        orderCancelService.ownerCancelOrderPre(param);
         return Result.ok();
     }
 
@@ -35,9 +41,8 @@ public class PerformanceSdkFeignController {
     @GetMapping("/orderCancelResidueWeight")
     public Result<OwnerCancelResidueWeightDTO> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
         log.info("当前订单可取消吨数参数：{}", TokenUtil.getLoginUserInfo());
-        //orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
         OwnerCancelResidueWeightDTO dto = new OwnerCancelResidueWeightDTO();
-        dto.setWeight(new BigDecimal("100").toString());
+        dto.setWeight(orderGoodsService.orderCancelResidueWeight(orderNo, optionType).toString());
         return Result.ok(dto);
     }
 }