2024-06-28-2提交

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

@@ -1781,7 +1781,8 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 vo.setOrderQuantity(0);
             }
         }
-        if (Objects.nonNull(query.getBeginPickUpTime()) && Objects.nonNull(query.getEndPickUpTime())) {
+        if (Objects.nonNull(query.getBeginPickUpTime()) &&
+                Objects.nonNull(query.getEndPickUpTime())) {
             // 入仓记录统计时，实测入仓数据替换为入仓记录中的和值
             StatisticsOrderVO pickUpVO = orderMapper.statisticsMyPickUp(query);
             if (Objects.nonNull(pickUpVO)) {

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -4779,8 +4779,8 @@
             on pt.id = oi.prod_type
             left join ecw_product_brank pb
             on pb.id = oi.brand
-            where oi.deleted = 0 ,
-            and (oi.`prod_title_zh` = #{query.eqProdKey} or oi.`prod_title_en` = #{query.eqProdKey} ,
+            where oi.deleted = 0
+            and (oi.`prod_title_zh` = #{query.eqProdKey} or oi.`prod_title_en` = #{query.eqProdKey}
             or pt.`title_zh` = #{query.eqProdKey} or pt.`title_en` = #{query.eqProdKey}
             or pb.`title_zh` = #{query.eqProdKey} or pb.`title_en` = #{query.eqProdKey})
             ))