Commit d2ba1ef1 by 吕明尚

修改续单判断

parent 4d4d4eb8
...@@ -828,7 +828,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -828,7 +828,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (Objects.nonNull(byId)) { if (Objects.nonNull(byId)) {
if (byId.getUseStatus().equals(UserStatusEnum.UNUSED.getCode())) { if (byId.getUseStatus().equals(UserStatusEnum.UNUSED.getCode())) {
if (StringUtils.isNotEmpty(byId.getCouponCode()) && ObjectUtil.isNotEmpty(byId.getDealId()) && byId.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (StringUtils.isNotEmpty(byId.getCouponCode()) && ObjectUtil.isNotEmpty(byId.getDealId()) && byId.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(byId.getCouponCode(), stores.stream().filter(store -> store.getId().equals(byId.getStoreId())).findFirst().get().getOpenShopUuid()); TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(byId.getCouponCode(),
stores.stream().filter(store -> store.getId().equals(byId.getStoreId())).findFirst().get().getOpenShopUuid());
if (getconsumed == null) { if (getconsumed == null) {
throw new RuntimeException("优惠券异常,请稍后再试"); throw new RuntimeException("优惠券异常,请稍后再试");
} }
...@@ -1070,10 +1071,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1070,10 +1071,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
if (CollectionUtils.isNotEmpty(orderList)) { if (CollectionUtils.isNotEmpty(orderList)) {
Optional<SOrder> lastOrderOp = orderList.stream().max(Comparator.comparing(SOrder::getPreEndDate)); Optional<SOrder> lastOrderOp = orderList.stream().max(Comparator.comparing(SOrder::getPreEndDate));
SOrder lastOrder = lastOrderOp.orElse(null); SOrder lastOrder = lastOrderOp.orElse(null);
if (lastOrder.getConsumerId().equals(user.getId())) { if (Objects.nonNull(lastOrder) && Objects.nonNull(lastOrder.getEndDate()) && lastOrder.getEndDate().compareTo(request.getPreStartDate()) < 0) {
return; if (lastOrder.getConsumerId().equals(user.getId())) {
} return;
if(Objects.nonNull(lastOrder)&&Objects.nonNull(lastOrder.getEndDate())&&lastOrder.getEndDate().compareTo(request.getPreStartDate())<0){ }
SCleanRecords sCleanRecords = cleanRecordsService.lastCleanByRoomId(lastOrder.getRoomId()); SCleanRecords sCleanRecords = cleanRecordsService.lastCleanByRoomId(lastOrder.getRoomId());
if (ObjectUtils.isEmpty(sCleanRecords)) { if (ObjectUtils.isEmpty(sCleanRecords)) {
return; return;
......
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