修改续单判断

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

@@ -828,7 +828,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 if (Objects.nonNull(byId)) {
                     if (byId.getUseStatus().equals(UserStatusEnum.UNUSED.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) {
                                 throw new RuntimeException("优惠券异常，请稍后再试");
                             }
@@ -1070,10 +1071,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (CollectionUtils.isNotEmpty(orderList)) {
             Optional<SOrder> lastOrderOp = orderList.stream().max(Comparator.comparing(SOrder::getPreEndDate));
             SOrder lastOrder = lastOrderOp.orElse(null);
-            if (lastOrder.getConsumerId().equals(user.getId())) {
-                return;
-            }
-            if(Objects.nonNull(lastOrder)&&Objects.nonNull(lastOrder.getEndDate())&&lastOrder.getEndDate().compareTo(request.getPreStartDate())<0){
+            if (Objects.nonNull(lastOrder) && Objects.nonNull(lastOrder.getEndDate()) && lastOrder.getEndDate().compareTo(request.getPreStartDate()) < 0) {
+                if (lastOrder.getConsumerId().equals(user.getId())) {
+                    return;
+                }
                 SCleanRecords sCleanRecords = cleanRecordsService.lastCleanByRoomId(lastOrder.getRoomId());
                 if (ObjectUtils.isEmpty(sCleanRecords)) {
                     return;