销售看板统计优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/SalesWaybillOrderService.java

@@ -54,7 +54,7 @@ public class SalesWaybillOrderService {
      * @return
      */
     public SalesWaybillOrderResp querySalesStatistics(SalesWaybillOrderQueryParam param) {
-        log.info("查询销售数据：{}", JSON.toJSONString(param));
+        log.info("查询销售数据：{}", param);
         SalesWaybillOrderResp salesResp = new SalesWaybillOrderResp();
         //查询销售企业的贸易订单id
         Set<Long> orderIds = tradeOrderInfoService.queryOrderIdByEntId(param.getEntId(), "2");
@@ -63,13 +63,15 @@ public class SalesWaybillOrderService {
         }
         // 查询销售企业的物流订单id
         List<KwtLogisticsOrder> logisticsOrders = logisticsOrderRepository.queryByTradeOrderIds(orderIds);
-        Set<Long> logOrderIds = Optional.ofNullable(logisticsOrders).orElse(Collections.emptyList())
-                .stream().map(KwtLogisticsOrder::getId).filter(Objects::nonNull)
-                .collect(Collectors.toSet());
-        if (CollectionUtils.isEmpty(logOrderIds)) {
+        if (CollectionUtils.isEmpty(logisticsOrders)) {
             return buildSalesWaybillOrderResp();
         }
 
+        Set<Long> logOrderIds = logisticsOrders.stream()
+                .map(KwtLogisticsOrder::getId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
         // 1. 计算执行中订单（物流订单）
         calOngoingLogOrderCount(param, salesResp);
 
@@ -79,7 +81,7 @@ public class SalesWaybillOrderService {
         // 3.计算场内车辆
         calInsideVehicleCount(logOrderIds, salesResp);
 
-        log.info("查询销售数据成功，结果：{}", JSON.toJSONString(salesResp));
+        log.info("查询销售数据成功，结果：{}", salesResp);
         return salesResp;
 
     }