Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into dev

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

@@ -3,6 +3,7 @@ package com.clx.performance.feign;
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressLogAction;
+import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
@@ -44,4 +45,10 @@ public interface PerformanceSDKFeign {
 
     @GetMapping("clx-performance/feign/sdk/queryPerformanceProgressLog")
     Result<List<PerformanceProgressOperationLogVO>> queryPerformanceProgressLog(@RequestBody QueryPerformanceProgressLogAction action);
+
+
+    @GetMapping(value = {"clx-performance/feign/sdk/getOrderCanExtractWeight"})
+    Result<OrderCanExtractWeightDTO> getOrderCanExtractWeight(@RequestParam(value = "orderNo") String orderNo);
+
+
 }

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

@@ -4,13 +4,16 @@ import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
 import com.clx.open.sdk.request.action.GetOwnerAccountInfoAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressAction;
 import com.clx.open.sdk.request.action.QueryPerformanceProgressLogAction;
+import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
 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.clx.performance.service.OrderWeightService;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.PerformanceProgressService;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
+import com.clx.performance.vo.feign.OrderExtractWeightVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.PerformanceProgressOperationLogVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
@@ -21,6 +24,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,6 +32,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import static com.clx.performance.enums.PerformanceProgressEnum.LogType.PERFORMANCE_ABNORMAL_REASON;
+import javax.validation.constraints.NotBlank;
 
 @Slf4j
 @RestController
@@ -48,6 +53,10 @@ public class PerformanceSdkFeignController {
 
     private final PerformanceProgressService performanceProgressService;
 
+    private final OrderWeightService orderWeightService;
+
+
+
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
@@ -88,4 +97,15 @@ public class PerformanceSdkFeignController {
     Result<List<PerformanceProgressOperationLogVO>> queryPerformanceProgressLog(@RequestBody QueryPerformanceProgressLogAction action){
         return Result.ok(performanceProgressService.getOperationLog(action.getOrderNo(),PERFORMANCE_ABNORMAL_REASON.getCode()));
     }
+    @ApiOperation(value = "获取当前订单的可提取吨数", notes = "<br>By:刘海泉")
+    @GetMapping("/getOrderCanExtractWeight")
+    public Result<OrderCanExtractWeightDTO> getOrderCanExtractWeight(@RequestParam(value = "orderNo")
+    @NotBlank(message = "订单编号不能为空") String orderNo) {
+        OrderExtractWeightVO orderCanExtractWeight = orderWeightService.getOrderCanExtractWeight(orderNo);
+        OrderCanExtractWeightDTO data  = new OrderCanExtractWeightDTO();
+        BeanUtils.copyProperties(orderCanExtractWeight,data);
+        return Result.ok(data);
+    }
+
+
 }