Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -64,7 +64,7 @@ public class GoblinRedisConst {
 
     /* ----------------------------------------------------------------- */
     public static final String FRONT_TOP_BANNER = PREFIX.concat("front_top_banner");  //前端顶部banner
-    public static final String FRONT_MIDDLE_BANNER = PREFIX.concat("front_top_banner");  //前端中部banner
+    public static final String FRONT_MIDDLE_BANNER = PREFIX.concat("front_middle_banner");  //前端中部banner
     public static final String FRONT_NAVIGATION = PREFIX.concat("front_navigation");  //前端banner
     public  static final String FRONT_HOTWORD = PREFIX.concat("front_hot_word");  //前端banner
     public  static final String FRONT_HOTWORD_INDEX = PREFIX.concat("front_hot_word_index");  //前端banner index

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

@@ -306,7 +306,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
                 GoblinGoodsSpecDto specDto = skuSpecList.get(j);
                 String specName = specDto.getSpecName();
                 String specVname = specDto.getSpecVname();
-                skuname = " ".concat(specVname);
+                skuname = skuname.concat(specVname);
 
                 GoblinGoodsSpecValueVo specValueVo = GoblinGoodsSpecValueVo.getNew().setSpecVname(specVname).setSpecVsort(i);
                 if (i == 0) {
@@ -316,7 +316,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
                     }
                     ArrayList<GoblinGoodsSpecValueVo> specValueVos = new ArrayList<>();
                     specValueVos.add(specValueVo);
-                    goodsSpecVos.add(GoblinGoodsSpecVo.getNew().setSpecName(specName).setSpecSort(j).setSpecValues(specValueVos));
+                    goodsSpecVos.add(GoblinGoodsSpecVo.getNew().setSpecName(specName).setSpecSort(j + 1).setSpecValues(specValueVos));
                 } else {
                     Optional<GoblinGoodsSpecVo> filterGoodsSpecOptional = goodsSpecVos.stream().filter(r -> r.getSpecName().equals(specName)).findAny();
                     if (filterGoodsSpecOptional.isPresent()) {// 存在该规格
@@ -335,7 +335,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
                 }
                 skuSpecNListTmp.add(specName);
             }
-            skuInfoVo.setName(skuname.substring(1));
+            skuInfoVo.setName(skuname);
         }
         goodsInfoVo.setPriceGe(priceGe);
         goodsInfoVo.setPriceLe(priceLe);

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

@@ -105,14 +105,17 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private List<GoblinServiceSupportVo> serviceSupportVoList;
     @ApiModelProperty(position = 54, value = "音乐人、艺术家、IP列表")
     private List<GoblinGoodsExtagVo> extagVoList;
-    @ApiModelProperty(position = 55, value = "活动Id")
-    private String marketId;
-    @ApiModelProperty(position = 56, value = "销量")
-    private Integer count;
 
     @ApiModelProperty(position = 55, value = "SPU包含的SKU_ID列表")
     private List<String> skuIdList;
 
+    /* ------------------------------------------------------------ */
+
+    @ApiModelProperty(position = 60, value = "活动Id")
+    private String marketId;
+    @ApiModelProperty(position = 61, value = "销量")
+    private Integer count;
+
     private static final GoblinGoodsInfoVo obj = new GoblinGoodsInfoVo();
 
     public static GoblinGoodsInfoVo getNew() {