修改 删除接口

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

@@ -130,10 +130,14 @@ 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))) ||
                             (et.isAfter(collectItem.getTimeStart().minusSeconds(1)) && et.isBefore(collectItem.getTimeEnd().minusSeconds(1)))) {
                         return ResponseDto.failure("sku时间不能重合");
                     }
+                } else {
+
+                }
             }
         } else {//未结束时间
             if (st.isAfter(skuInfoVo.getSaleStartTime())) {
@@ -141,9 +145,13 @@ 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))) {
                         return ResponseDto.failure("sku时间不能重合");
                     }
+                }else{
+
+                }
             }
         }
 
@@ -271,6 +279,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
             // 黑名单
             queueUtils.sendMsgByRedisXls(vo.getListId(), "", vo.getBlackUrl(), "4", item.getSkuId());
         }
+        redisUtils.delGoblinListCollect(vo.getItemVo().get(0).getSkuId(), listId);
         redisUtils.delGoblinListDetailsVo(listId);
         mongoUtils.removeGoblinListDetailsVo(listId);
         //sql入库