修改 分批购时间配置

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinListServiceImpl.java

@@ -125,20 +125,20 @@ public class GoblinListServiceImpl implements IGoblinListService {
             if (st.isAfter(et)) {
                 return ResponseDto.failure("开始时间不能晚于结束时间");
             }
-            if (et.isAfter(skuInfoVo.getSaleStartTime())) {
+            if (et.isAfter(skuInfoVo.getSaleStartTime().minusSeconds(1))) {
                 return ResponseDto.failure("结束时间不能晚于商品开售时间");
             }
             collectVos = redisUtils.getGoblinListCollect(skuId);
             for (GoblinListCollectVo collectItem : collectVos) {
                 if (collectItem.getTimeEnd() != null) {
-                    if ((st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().minusSeconds(1))) ||
-                            (et.isAfter(collectItem.getTimeStart().minusSeconds(1)) && et.isBefore(collectItem.getTimeEnd().minusSeconds(1))) ||
+                    if ((st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().plusSeconds(1))) ||
+                            (et.isAfter(collectItem.getTimeStart().plusSeconds(1)) && et.isBefore(collectItem.getTimeEnd().minusSeconds(1))) ||
                             (st.isBefore(collectItem.getTimeStart().minusSeconds(1)) && et.isAfter(collectItem.getTimeEnd().minusSeconds(1)))
                     ) {//开始时间不能在其他时间段内/结束间不能在其他时间段内/开始结束时间不能包含其他时间段
                         return ResponseDto.failure("sku时间不能重合");
                     }
                 } else {
-                    if (st.isBefore(collectItem.getTimeStart().minusSeconds(1)) && et.isAfter(collectItem.getTimeStart().minusSeconds(1))) {
+                    if (st.isBefore(collectItem.getTimeStart().minusSeconds(1)) && et.isAfter(collectItem.getTimeStart().plusSeconds(1))) {
                         return ResponseDto.failure("sku时间不能重合");//开始结束时间不能包含只有开始时间的时间段
                     }
                 }
@@ -150,7 +150,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
             collectVos = redisUtils.getGoblinListCollect(skuId);
             for (GoblinListCollectVo collectItem : collectVos) {
                 if (collectItem.getTimeEnd() != null) {
-                    if (st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().minusSeconds(1))) {
+                    if (st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().plusSeconds(1))) {
                         return ResponseDto.failure("sku时间不能重合");
                     }
                 } else {