Merge remote-tracking branch 'origin/v21.5_offered_third_data_20240812' into dev

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

@@ -5,6 +5,7 @@ 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.OrderStatisticsInfoDTO;
+import com.clx.open.sdk.request.dto.BatchOrderStatisticsInfoDTO;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
-import java.util.Map;
 
 @FeignClient(name = "clx-performance", configuration = PerformanceClientConfiguration.class)
 public interface PerformanceSDKFeign {
@@ -50,12 +50,9 @@ public interface PerformanceSDKFeign {
     Result<List<PerformanceProgressOperationLogVO>> queryPerformanceProgressLog(@RequestBody QueryPerformanceProgressLogAction action);
 
 
-    @GetMapping(value = {"clx-performance/feign/sdk/getOrderCanExtractWeight"})
-    Result<OrderCanExtractWeightDTO> getOrderCanExtractWeight(@RequestParam(value = "orderNo") String orderNo);
-
 
 
     @GetMapping("clx-performance/feign/sdk/queryTaskStatisticsInfo")
-    Result<Map<String, OrderStatisticsInfoDTO>> queryTaskStatisticsInfo(@RequestParam("orderNoList")
+    Result<BatchOrderStatisticsInfoDTO> queryTaskStatisticsInfo(@RequestParam("orderNoList")
     @NotEmpty(message = "订单编号集合不能为空") List<String> orderNoList);
 }

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

@@ -4,6 +4,7 @@ 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.BatchOrderStatisticsInfoDTO;
 import com.clx.open.sdk.request.dto.OrderStatisticsInfoDTO;
 import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.extranal.user.OrderService;
@@ -115,7 +116,7 @@ public class PerformanceSdkFeignController {
 
     @ApiOperation(value = "查询订单相关统计信息", notes = "<br>By:刘海泉")
     @GetMapping("/queryTaskStatisticsInfo")
-    Result<List<OrderStatisticsInfoDTO>> queryTaskStatisticsInfo(@RequestParam("orderNoList")
+    Result<BatchOrderStatisticsInfoDTO> queryTaskStatisticsInfo(@RequestParam("orderNoList")
     @NotEmpty(message = "订单编号集合不能为空") List<String> orderNoList){
         return Result.ok(orderService.queryTaskStatisticsInfo(orderNoList));
     }

performance-web/src/main/java/com/clx/performance/extranal/user/OrderService.java

 package com.clx.performance.extranal.user;
 
+import com.clx.open.sdk.request.dto.BatchOrderStatisticsInfoDTO;
 import com.clx.open.sdk.request.dto.OrderStatisticsInfoDTO;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.msl.common.base.Optional;
@@ -16,5 +17,5 @@ public interface OrderService {
     Optional<List<String>>   getMonthSameLineOrderList(String orderNo);
 
 
-    List<OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList);
+    BatchOrderStatisticsInfoDTO queryTaskStatisticsInfo(List<String> orderNoList);
 }

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java

 package com.clx.performance.extranal.user.impl;
 
+import com.clx.open.sdk.request.dto.BatchOrderStatisticsInfoDTO;
 import com.clx.open.sdk.request.dto.OrderStatisticsInfoDTO;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignOrderInfoVO;
@@ -55,7 +56,8 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public List<OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList) {
+    public BatchOrderStatisticsInfoDTO queryTaskStatisticsInfo(List<String> orderNoList) {
+        BatchOrderStatisticsInfoDTO returnResult = new BatchOrderStatisticsInfoDTO();
         //构建结果集
         Map<String, OrderStatisticsInfoDTO> result = new HashMap<>();
         orderNoList.forEach(item->{
@@ -75,7 +77,8 @@ public class OrderServiceImpl implements OrderService {
         List<OrderGoods> orderGoods = orderGoodsDao.listInField(OrderGoods::getOrderNo, orderNoList);
 
         if(CollectionUtils.isEmpty(orderGoods)){
-            return new ArrayList<>(result.values());
+            returnResult.setList(new ArrayList<>(result.values()));
+            return returnResult;
         }
         //计算挂单车数
         for (OrderGoods orderGood : orderGoods) {
@@ -86,7 +89,8 @@ public class OrderServiceImpl implements OrderService {
         //计算运单相关统计数据
         List<OrderChild> childList = orderChildDao.listInField(OrderChild::getOrderNo, orderNoList);
         if(CollectionUtils.isEmpty(childList)){
-            return new ArrayList<>(result.values());
+            returnResult.setList(new ArrayList<>(result.values()));
+            return returnResult;
         }
 
         for (OrderChild child : childList) {
@@ -123,6 +127,7 @@ public class OrderServiceImpl implements OrderService {
             }
             result.put(child.getOrderNo(),dto);
         }
-        return new ArrayList<>(result.values());
+        returnResult.setList(new ArrayList<>(result.values()));
+        return returnResult;
     }
 }