sqb 规格

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

@@ -47,9 +47,8 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     @NotNull(message = "单品默认图片不能为空")
     @Size(max = 256, message = "单品默认图片URL过长")
     private String skuPic;
-    @ApiModelProperty(position = 14, required = true, value = "单品规格信息")
+    @ApiModelProperty(position = 14, required = false, value = "单品规格信息；编辑时可不传或传[]表示沿用/无规格（如收钱吧同步SKU）")
     @Valid
-    @NotNull(message = "规格信息不能为空")
     private List<GoblinGoodsSpecDto> skuSpecList;
     @ApiModelProperty(position = 15, required = false, value = "单品销售价-原价[20,2]")
     private BigDecimal sellPrice;

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

@@ -948,8 +948,12 @@ public class GoblinStoreMgtGoodsController {
         Map<String, String> delSpuSpecMap = CollectionUtil.mapStringString();
         Map<String, String> addSpuSpecMap = CollectionUtil.mapStringString();
         {// 规格校验、处理
-            Map<String, String> befSkuSpecNameVnameMap = mgtGoodsSkuInfoVo.getSkuSpecList().stream()
-                    .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname));
+            if (null == mgtGoodsEditSkuParam.getSkuSpecList()) {
+                mgtGoodsEditSkuParam.setSkuSpecList(new ArrayList<>());
+            }
+            List<GoblinGoodsSpecDto> befSkuSpecList = mgtGoodsSkuInfoVo.getSkuSpecList();
+            Map<String, String> befSkuSpecNameVnameMap = CollectionUtils.isEmpty(befSkuSpecList) ? CollectionUtil.mapStringString()
+                    : befSkuSpecList.stream().collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname));
             List<GoblinGoodsSpecDto> paramSkuSpecList = mgtGoodsEditSkuParam.getSkuSpecList();
             Set<String> befSkuSpecNameSet = befSkuSpecNameVnameMap.keySet();
             Map<String, String> paramUpdateSkuSpecMap = CollectionUtil.mapStringString();
@@ -1268,6 +1272,9 @@ public class GoblinStoreMgtGoodsController {
                 }
             }
         }
+        if (CollectionUtils.isEmpty(mgtGoodsEditSkuParam.getSkuSpecList())) {
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "规格信息不能为空");
+        }
         List<String> skuIdList = goodsInfoVo.getSkuIdList();
         List<GoblinGoodsSpecDto> paramSkuSpecDtoList = mgtGoodsEditSkuParam.getSkuSpecList();
         for (String skuId : skuIdList) {// 比对所有SKU规格信息

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

@@ -1313,6 +1313,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             boolean updateGoodsInfoVoFlg = false;
             List<GoblinGoodsSpecDto> skuSpecList = updateSkuInfoVo.getSkuSpecList();
             List<GoblinGoodsSpecVo> specVoList = goodsInfoVo.getSpecVoList();
+            if (!CollectionUtils.isEmpty(skuSpecList)) {
                 skuSpecList.forEach(spec -> {
                     String specName = spec.getSpecName(), specVname = spec.getSpecVname();
 
@@ -1326,6 +1327,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                                 .add(new Object[] { specVname, marketSkuId, specName }));
                     }
                 });
+            }
             if (!delSpuSpecMap.isEmpty()) {// 删除了规格值，需要同步SPU里的规格信息
                 updateGoodsInfoVoFlg = true;
                 goodsInfoVo.setUpdatedBy(uid);