Commit a194e259 by 吕明尚

修改续单订单查询

parent 0797546d
...@@ -1020,12 +1020,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1020,12 +1020,15 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
private void checkOrderDate(CreateOrderRequest request) { private void checkOrderDate(CreateOrderRequest request) {
SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus()); queryWrapper.notIn(SOrder::getRefundStatus, RefundStatusEnum.getRefundedStatus());
queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus()); queryWrapper.in(SOrder::getStatus, OrderStatusEnum.getValidOrderStatus());
queryWrapper.eq(SOrder::getPayStatus, YesNoEnum.yes.getIndex());
queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex()); queryWrapper.eq(SOrder::getIsDelete,YesNoEnum.no.getIndex());
queryWrapper.eq(SOrder::getStoreId, request.getStoreId()); queryWrapper.eq(SOrder::getStoreId, request.getStoreId());
queryWrapper.eq(SOrder::getRoomId, request.getRoomId()); queryWrapper.eq(SOrder::getRoomId, request.getRoomId());
queryWrapper.ne(SOrder::getConsumerId, user.getId());
switch (OrderTypeEnum.getEnumByCode(request.getOrderType())) { switch (OrderTypeEnum.getEnumByCode(request.getOrderType())) {
case RESERVER://预定 case RESERVER://预定
//订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内 //订单开始时间在 【预定开始时间 和 预定结束时间+30分保洁】区间内
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment