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

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

@@ -31,7 +31,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
-import java.util.Map;
 
 import static com.clx.performance.enums.PerformanceProgressEnum.LogType.PERFORMANCE_ABNORMAL_REASON;
 import javax.validation.constraints.NotBlank;
@@ -116,7 +115,7 @@ public class PerformanceSdkFeignController {
 
     @ApiOperation(value = "查询订单相关统计信息", notes = "<br>By:刘海泉")
     @GetMapping("/queryTaskStatisticsInfo")
-    Result<Map<String, OrderStatisticsInfoDTO>> queryTaskStatisticsInfo(@RequestParam("orderNoList")
+    Result<List<OrderStatisticsInfoDTO>> 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

@@ -6,7 +6,6 @@ import com.msl.common.base.Optional;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
-import java.util.Map;
 
 public interface OrderService {
 
@@ -19,6 +18,5 @@ public interface OrderService {
 
     Optional<Map<String,FeignOrderInfoVO>> queryListOrderByOrderNoList(List<String> orderNoList);
 
-
-    Map<String, OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList);
+    List<OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList);
 }

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

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -54,7 +55,7 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public Map<String, OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList) {
+    public List<OrderStatisticsInfoDTO> queryTaskStatisticsInfo(List<String> orderNoList) {
         //构建结果集
         Map<String, OrderStatisticsInfoDTO> result = new HashMap<>();
         orderNoList.forEach(item->{
@@ -74,7 +75,7 @@ public class OrderServiceImpl implements OrderService {
         List<OrderGoods> orderGoods = orderGoodsDao.listInField(OrderGoods::getOrderNo, orderNoList);
 
         if(CollectionUtils.isEmpty(orderGoods)){
-            return result;
+            return new ArrayList<>(result.values());
         }
         //计算挂单车数
         for (OrderGoods orderGood : orderGoods) {
@@ -85,7 +86,7 @@ public class OrderServiceImpl implements OrderService {
         //计算运单相关统计数据
         List<OrderChild> childList = orderChildDao.listInField(OrderChild::getOrderNo, orderNoList);
         if(CollectionUtils.isEmpty(childList)){
-            return result;
+            return new ArrayList<>(result.values());
         }
 
         for (OrderChild child : childList) {
@@ -122,6 +123,6 @@ public class OrderServiceImpl implements OrderService {
             }
             result.put(child.getOrderNo(),dto);
         }
-        return result;
+        return new ArrayList<>(result.values());
     }
 }