修改续单订单查询

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1020,12 +1020,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
 
 
     private void checkOrderDate(CreateOrderRequest request) {
+        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
         queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
+        queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
         queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex());
         queryWrapper.eq(SOrder::getStoreId, request.getStoreId());
         queryWrapper.eq(SOrder::getRoomId, request.getRoomId());
+        queryWrapper.ne(SOrder::getConsumerId, user.getId());
         switch (OrderTypeEnum.getEnumByCode(request.getOrderType())) {
             case RESERVER://预定
                 //订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内