修改 添加接口 的 sku时间重合判断

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

@@ -132,11 +132,15 @@ public class GoblinListServiceImpl implements IGoblinListService {
             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)))) {
+                            (et.isAfter(collectItem.getTimeStart().minusSeconds(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))){
+                        return ResponseDto.failure("sku时间不能重合");
+                    }
                 }
             }
         } else {//未结束时间
@@ -149,7 +153,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
                     if (st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().minusSeconds(1))) {
                         return ResponseDto.failure("sku时间不能重合");
                     }
-                }else{
+                } else {
 
                 }
             }