变更

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -147,7 +147,10 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		itemQueryWrapper.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getTenantId, AuthUtil.getTenantId())
 			.eq(OrderItem::getIsDeleted, 0)
-			.ne(OrderItem::getShippingMode, "散货");
+			.ne(OrderItem::getShippingMode, "散货")
+			.between(StringUtil.isNotBlank(orderItem.getBeginArrivalTime()) && StringUtil.isNotBlank(orderItem.getEndArrivalTime()),
+				OrderItem::getArrivalTime, orderItem.getBeginArrivalTime(), orderItem.getEndArrivalTime());
+
 		List<OrderItem> itemList = baseMapper.selectList(itemQueryWrapper);
 		long all = itemList.size();
 		long one = itemList.stream().filter(item -> item.getStatus() == 1).count();

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -443,6 +443,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		long four = 0;
 
 		List<Long> orderIdList;
+
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 			.eq(Order::getIsDeleted, 0)