Merge branch 'refs/heads/v20.4_exception_report_20240802' into dev

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

@@ -2,9 +2,12 @@ package com.clx.performance.feign;
 
 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.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.PerformanceProgressDetailVO;
+import com.clx.performance.vo.pc.PerformanceProgressVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleFileVO;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -13,6 +16,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(name = "clx-performance", configuration = PerformanceClientConfiguration.class)
 public interface PerformanceSDKFeign {
 
@@ -34,4 +39,6 @@ public interface PerformanceSDKFeign {
     @PostMapping("clx-performance/feign/sdk/getOwnerRuleFile")
     Result<BreakContractOwnerRuleFileVO> getOwnerRuleFile(@RequestBody GetOrderBreakContractOwnerRuleFileAction action);
 
+    @GetMapping("clx-performance/feign/sdk/queryPerformanceProgress")
+    Result<List<PerformanceProgressVO>> queryPerformanceProgress(@RequestBody QueryPerformanceProgressAction action);
 }

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

@@ -2,13 +2,16 @@ package com.clx.performance.controller.feign;
 
 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.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.OwnerAccountService;
+import com.clx.performance.service.PerformanceProgressService;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
+import com.clx.performance.vo.pc.PerformanceProgressVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleFileVO;
 import com.msl.common.result.Result;
 import com.msl.user.utils.TokenUtil;
@@ -20,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -38,6 +42,8 @@ public class PerformanceSdkFeignController {
 
     private final BreakContractOwnerRuleService breakContractOwnerRuleService;
 
+    private final PerformanceProgressService performanceProgressService;
+
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
@@ -67,4 +73,9 @@ public class PerformanceSdkFeignController {
         return Result.ok(breakContractOwnerRuleService.getRuleFile(action.getId()));
     }
 
+    @ApiOperation(value = "查询履约进度", notes = "<br>By:杨启发")
+    @GetMapping("/queryPerformanceProgress")
+    Result<List<PerformanceProgressVO>> queryPerformanceProgress(@RequestBody QueryPerformanceProgressAction action){
+        return Result.ok(performanceProgressService.queryPerformanceProgress(action.getOrderNoList()));
+    }
 }

performance-web/src/main/java/com/clx/performance/service/PerformanceProgressService.java

@@ -34,7 +34,7 @@ public interface PerformanceProgressService {
 
     void dealPerformanceProgress4OrderInfo(OrderInfoMessage data);
 
-
+    List<PerformanceProgressVO> queryPerformanceProgress(List<String> orderNoList);
 
     void dealPerformanceProgress4OrderGoods(OrderGoods data);
 

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -492,6 +492,10 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         performanceProgressDao.updateEntityByKey(update);
     }
 
+    @Override
+    public List<PerformanceProgressVO> queryPerformanceProgress(List<String> orderNoList) {
+        return performanceProgressStruct.convertList(performanceProgressDao.listInField(PerformanceProgress::getOrderNo, orderNoList));
+    }
 
     // 计算接单率
     public BigDecimal calcOrderedRate(BigDecimal orderedWeight,BigDecimal pendingWeight){