订单提货记录时间统计业务修正

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java

@@ -3366,4 +3366,6 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
      */
     @Update("update ecw_order set customer_id=#{customerId},salesman_id=#{salesmanId} where order_id = #{orderId}")
     void updateOrderCustomerAndSalesmanId(@Param("customerId")Long customerId,@Param("salesmanId") Long salesmanId,@Param("orderId") Long orderId);
+
+    StatisticsOrderVO statisticsPickUp(@Param("query") OrderQueryVO query);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -1705,15 +1705,15 @@ public class OrderQueryServiceImpl implements OrderQueryService {
 //                vo.setOrderQuantity(0);
 //            }
 //        }
-//        if (Objects.nonNull(query.getBeginPickUpTime()) && Objects.nonNull(query.getEndPickUpTime())) {
-//            // 入仓记录统计时，实测入仓数据替换为入仓记录中的和值
-//            StatisticsOrderVO pickUpVO = orderMapper.statisticsPickUp(query);
-//            if (Objects.nonNull(pickUpVO)) {
-//                vo.setTotalNum(pickUpVO.getTotalNum());
-//            } else {
-//                vo.setTotalNum(0);
-//            }
-//        }
+        if (Objects.nonNull(query.getBeginPickUpTime()) && Objects.nonNull(query.getEndPickUpTime())) {
+            // 入仓记录统计时，实测入仓数据替换为入仓记录中的和值
+            StatisticsOrderVO pickUpVO = orderMapper.statisticsPickUp(query);
+            if (Objects.nonNull(pickUpVO)) {
+                vo.setTotalNum(pickUpVO.getTotalNum());
+            } else {
+                vo.setTotalNum(0);
+            }
+        }
         return vo;
     }
 
@@ -1760,16 +1760,16 @@ public class OrderQueryServiceImpl implements OrderQueryService {
 //                vo.setOrderQuantity(0);
 //            }
 //        }
-//        if (Objects.nonNull(query.getBeginPickUpTime()) &&
-//                Objects.nonNull(query.getEndPickUpTime())) {
-//            // 提货记录统计时，实测入仓数据替换为提货记录中的和值
-//            StatisticsOrderVO pickUpVO = orderMapper.statisticsMyPickUp(query);
-//            if (Objects.nonNull(pickUpVO)) {
-//                vo.setTotalNum(pickUpVO.getTotalNum());
-//            } else {
-//                vo.setTotalNum(0);
-//            }
-//        }
+        if (Objects.nonNull(query.getBeginPickUpTime()) &&
+                Objects.nonNull(query.getEndPickUpTime())) {
+            // 提货记录统计时，实测入仓数据替换为提货记录中的和值
+            StatisticsOrderVO pickUpVO = orderMapper.statisticsPickUp(query);
+            if (Objects.nonNull(pickUpVO)) {
+                vo.setTotalNum(pickUpVO.getTotalNum());
+            } else {
+                vo.setTotalNum(0);
+            }
+        }
         return vo;
     }