~bug:#992;

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

@@ -17,9 +17,11 @@ public class GoblinStoreMgtThumbVo implements java.io.Serializable, Cloneable {
     private String logoPic;
     @ApiModelProperty(position = 13, value = "店铺状态[0-填写资料中|1-店铺审核中|2-审核不通过|3-审核通过|4-停业|5-营业]")
     private String status;
-    @ApiModelProperty(position = 14, value = "店铺类型[1-普通店铺|2-加盟|3-连锁|5-直营]")
+    @ApiModelProperty(position = 14, value = "拒绝原因[256]")
+    private String reason;
+    @ApiModelProperty(position = 15, value = "店铺类型[1-普通店铺|2-加盟|3-连锁|5-直营]")
     private String storeType;
-    @ApiModelProperty(position = 15, value = "认证类型[1-企业/公司|2-个体工商户]")
+    @ApiModelProperty(position = 16, value = "认证类型[1-企业/公司|2-个体工商户]")
     private String certType;
 
     private static final GoblinStoreMgtThumbVo obj = new GoblinStoreMgtThumbVo();
@@ -37,6 +39,7 @@ public class GoblinStoreMgtThumbVo implements java.io.Serializable, Cloneable {
         this.setStoreName(source.getStoreName());
         this.setLogoPic(source.getLogoPic());
         this.setStatus(source.getStatus());
+        this.setReason(source.getReason());
         this.setStoreType(source.getStoreType());
         this.setCertType(source.getCertType());
         return this;

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

@@ -147,8 +147,8 @@ public class GoblinStoreMgtGoodsController {
             List<String> tagIdList = CollectionUtil.arrayListString();
             tagIdList.addAll(goodsTagIdList);
             tagIdList.addAll(goodsExtagIdList);
-            if (!CollectionUtils.isEmpty(tagIdList)) {
-                List<GoblinSelfTagVo> selfTagVoList = goblinMongoUtils.getSelfTagVos(tagIdList);
+            List<GoblinSelfTagVo> selfTagVoList;
+            if (!CollectionUtils.isEmpty(tagIdList) && !CollectionUtils.isEmpty(selfTagVoList = goblinMongoUtils.getSelfTagVos(tagIdList))) {
                 if (!CollectionUtils.isEmpty(goodsTagIdList)) {
                     List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
                     for (int i = 0; i < goodsTagIdList.size(); i++)
@@ -170,7 +170,7 @@ public class GoblinStoreMgtGoodsController {
         goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(storeMgtGoodsAddParam.getSsidList()));
 
         goblinstoreMgtGoodsService.goodsAdd(goodsInfoVo, goodsSkuInfoVoList);
-        return ResponseDto.success();
+        return ResponseDto.success(goodsInfoVo.getSpuId());
     }
 
     @ApiOperationSupport(order = 5)