提交 黑白名单 名称字段

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListDetailsVo.java

@@ -34,6 +34,11 @@ public class GoblinListDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "创建时间")
     private String createdAt;
 
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+
     private static final GoblinListDetailsVo obj = new GoblinListDetailsVo();
 
     public static GoblinListDetailsVo getNew() {

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinListCreateParam.java

@@ -26,6 +26,10 @@ public class GoblinListCreateParam {
     private String timeEnd;
     @ApiModelProperty(value = "黑名单文件地址")
     private String blackUrl;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
     @ApiModelProperty(value = "商品数据")
     private List<GoblinListCreateItemParam> itemParams;
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinListUpdateParam.java

@@ -18,4 +18,8 @@ public class GoblinListUpdateParam {
     private String whiteUrl;
     @ApiModelProperty(value = "黑名单文件地址")
     private String blackUrl;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
 }

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

@@ -163,9 +163,12 @@ public class GoblinListServiceImpl implements IGoblinListService {
                 return ResponseDto.failure("未上传指定用户文件");
             }
             vo.setWhiteUrl(param.getWhiteUrl());
+            vo.setWhiteName(param.getWhiteName());
         } else {//不需要xls文件
             vo.setWhiteUrl("");
+            vo.setWhiteName("");
         }
+        vo.setBlackName(param.getBlackName() == null ? "" : param.getBlackName());
         vo.setBlackUrl(param.getBlackUrl() == null ? "" : param.getBlackUrl());
         for (GoblinListCreateItemParam item : param.getItemParams()) {
             GoblinListDetailsItemVo itemVo = GoblinListDetailsItemVo.getNew();
@@ -232,10 +235,13 @@ public class GoblinListServiceImpl implements IGoblinListService {
                 return ResponseDto.failure("未上传指定用户文件");
             }
             vo.setWhiteUrl(param.getWhiteUrl());
+            vo.setWhiteName(param.getWhiteName());
         } else {//不需要xls文件
             vo.setWhiteUrl("");
+            vo.setWhiteName("");
         }
         vo.setBlackUrl(param.getBlackUrl() == null ? "" : param.getBlackUrl());
+        vo.setBlackName(param.getBlackName() == null ? "" : param.getBlackName());
         for (GoblinListDetailsItemVo item : vo.getItemVo()) {
             // 白名单
             queueUtils.sendMsgByRedisXls(param.getWhiteUrl(), whiteUrl, "3", item.getSkuId());