提交 名单创建bug

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

@@ -35,12 +35,12 @@ public class GoblinListController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "活动名称"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "name", value = "活动名称"),
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数"),
 
     })
     @GetMapping("list")
-    public ResponseDto<PageInfo<GoblinListVo>> list(@RequestParam String name,
+    public ResponseDto<PageInfo<GoblinListVo>> list(@RequestParam(value = "name", required = false) String name,
                                                     @RequestParam Integer page) {
         return goblinListService.getList(name, page);
     }

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

@@ -60,6 +60,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
             vo.setTimeEnd(item.getTimeEnd());
             vo.setSkuCount(item.getItemVo().size());
             vo.setHasBlack(item.getBlackUrl().equals("") ? 0 : 1);
+            voList.add(vo);
         }
         pageResult = new PageInfo(voList);
         pageResult.setTotal((Long) map.get("total"));
@@ -127,8 +128,8 @@ public class GoblinListServiceImpl implements IGoblinListService {
             }
             collectVos = redisUtils.getGoblinListCollect(skuId);
             for (GoblinListCollectVo collectItem : collectVos) {
-                if (st.isAfter(collectItem.getTimeStart()) || st.isBefore(collectItem.getTimeEnd()) ||
-                        et.isAfter(collectItem.getTimeStart()) || et.isBefore(collectItem.getTimeEnd())) {
+                if ((st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().plusSeconds(1))) ||
+                        (et.isAfter(collectItem.getTimeStart().minusSeconds(1)) && et.isBefore(collectItem.getTimeEnd().plusSeconds(1)))) {
                     return ResponseDto.failure("sku时间不能重合");
                 }
             }
@@ -138,7 +139,7 @@ public class GoblinListServiceImpl implements IGoblinListService {
             }
             collectVos = redisUtils.getGoblinListCollect(skuId);
             for (GoblinListCollectVo collectItem : collectVos) {
-                if (st.isAfter(collectItem.getTimeStart()) || st.isBefore(collectItem.getTimeEnd())) {
+                if (st.isAfter(collectItem.getTimeStart().minusSeconds(1)) && st.isBefore(collectItem.getTimeEnd().plusSeconds(1))) {
                     return ResponseDto.failure("sku时间不能重合");
                 }
             }
@@ -192,9 +193,9 @@ public class GoblinListServiceImpl implements IGoblinListService {
             collectVos.add(collectVo);
             redisUtils.setGoblinListCollect(itemVo.getSkuId(), collectVos);
             // 白名单
-            queueUtils.sendMsgByRedisXls(param.getWhiteUrl(), "", "3", item.getSkuId());
+            queueUtils.sendMsgByRedisXls(vo.getWhiteUrl(), "", "3", item.getSkuId());
             // 黑名单
-            queueUtils.sendMsgByRedisXls(param.getBlackUrl(), "", "4", item.getSkuId());
+            queueUtils.sendMsgByRedisXls(vo.getBlackUrl(), "", "4", item.getSkuId());
             goblinListDetails.add(new Object[]{
                     vo.getListId(), itemVo.getSpuId(), itemVo.getSkuId(), now, itemVo.getSkuStock(), itemVo.getPriceV(), itemVo.getProductId(), itemVo.getPrice()
             });