fix

@@ -298,11 +298,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
       }
       }
 
 
       if (request.getShouldFilterPayTimeStart()) {
       if (request.getShouldFilterPayTimeStart()) {
-        queryWrapper.ge(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeStart()));
+        queryWrapper.ge(OrderDb::getPayTime, LocalDateTimeUtil.ofUTC(request.getPayTimeStart()));
       }
       }
 
 
       if (request.getShouldFilterPayTimeEnd()) {
       if (request.getShouldFilterPayTimeEnd()) {
-        queryWrapper.le(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeEnd()));
+        queryWrapper.le(OrderDb::getPayTime, LocalDateTimeUtil.ofUTC(request.getPayTimeEnd()));
       }
       }
 
 
       if (request.getShouldFilterPayStatus()) {
       if (request.getShouldFilterPayStatus()) {
@@ -310,11 +310,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
       }
       }
 
 
       if (request.getShouldFilterMealTimeStart()) {
       if (request.getShouldFilterMealTimeStart()) {
-        queryWrapper.ge(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeStart()));
+        queryWrapper.ge(OrderDb::getMealTime, LocalDateTimeUtil.ofUTC(request.getMealTimeStart()));
       }
       }
 
 
       if (request.getShouldFilterMealTimeEnd()) {
       if (request.getShouldFilterMealTimeEnd()) {
-        queryWrapper.le(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeEnd()));
+        queryWrapper.le(OrderDb::getMealTime, LocalDateTimeUtil.ofUTC(request.getMealTimeEnd()));
       }
       }
 
 
       if (request.getShouldFilterRoomNo()) {
       if (request.getShouldFilterRoomNo()) {

@@ -265,7 +265,12 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
         .collect(Collectors.toList());
         .collect(Collectors.toList());
 
 
     for (Integer orderId: orderIds) {
     for (Integer orderId: orderIds) {
-      final var curOrderDetailStatus = orderDetails.stream()
+      // 找出这个订单所有的order detail
+      QueryWrapper<OrderDetailDb> detailWrapper = new QueryWrapper<>();
+      detailWrapper.eq("isDeleted", false);
+      detailWrapper.eq("orderId", orderId);
+      final var curOrderDetails = orderDetailMapper.selectList(detailWrapper);
+      final var curOrderDetailStatus = curOrderDetails.stream()
           .filter(d -> d.getOrderId().equals(orderId))
           .filter(d -> d.getOrderId().equals(orderId))
           .map(OrderDetailDb::getServeStatus)
           .map(OrderDetailDb::getServeStatus)
           .distinct()
           .distinct()