Merge remote-tracking branch 'origin/v22.7_order_delay_20240827' into test

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
 import java.util.List;
 
 @FeignClient(name = "clx-performance", configuration = PerformanceClientConfiguration.class)
@@ -59,4 +60,9 @@ public interface PerformanceSDKFeign {
     @GetMapping("clx-performance/feign/sdk/queryTaskStatisticsInfo")
     Result<BatchOrderStatisticsInfoDTO> queryTaskStatisticsInfo(@RequestParam("orderNoList")
     @NotEmpty(message = "订单编号集合不能为空") List<String> orderNoList);
+
+
+
+    @GetMapping(value = {"clx-performance/feign/sdk/getOrderResidueWeight"})
+    Result<BigDecimal> getOrderResidueWeight(@RequestParam(value = "orderNo") String orderNo);
 }

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

 package com.clx.performance.controller.feign;
 
 import com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction;
-import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
-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.BatchOrderStatisticsInfoDTO;
-import com.clx.open.sdk.request.dto.OrderStatisticsInfoDTO;
+import com.clx.open.sdk.request.dto.OrderCanExtractWeightDTO;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.extranal.user.OrderService;
 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.*;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
 import com.clx.performance.vo.feign.OrderExtractWeightVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
@@ -32,12 +26,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 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
@@ -124,4 +118,14 @@ public class PerformanceSdkFeignController {
     @NotEmpty(message = "订单编号集合不能为空") List<String> orderNoList){
         return Result.ok(orderService.queryTaskStatisticsInfo(orderNoList));
     }
+
+
+
+    @ApiOperation(value = "获取当前订单的剩余吨数", notes = "<br>By:刘海泉")
+    @GetMapping("/getOrderResidueWeight")
+    public Result<BigDecimal> getOrderResidueWeight(@RequestParam(value = "orderNo")
+    @NotBlank(message = "订单编号不能为空") String orderNo) {
+        BigDecimal residueWeight = orderWeightService.getOrderResidueWeight(orderNo);
+        return Result.ok(residueWeight);
+    }
 }