~API:SKU编辑同步活动商品调整;

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

@@ -26,10 +26,12 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     @NotBlank(message = "店铺ID不能为空")
     private String storeId;
     @ApiModelProperty(position = 11, required = true, value = "商品ID[64]")
+    @NotNull(message = "商品ID不能为空")
     private String spuId;
     @ApiModelProperty(position = 12, required = false, value = "单品ID[编辑时必传]")
     private String skuId;
     @ApiModelProperty(position = 13, required = true, value = "单品默认图片的url[256]")
+    @NotNull(message = "单品默认图片不能为空")
     private String skuPic;
     @ApiModelProperty(position = 14, required = true, value = "单品规格信息")
     @Valid
@@ -53,11 +55,14 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     private Integer skuStock;
     @ApiModelProperty(position = 21, required = false, value = "预警库存")
     private Integer warningStock;
-    @ApiModelProperty(position = 22, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    @ApiModelProperty(position = 22, required = true, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    @NotBlank(message = "是否隐藏不能为空")
+    @Pattern(regexp = "\\b(0|1)\\b", message = "购买限制参数无效")
     private String skuAppear;
     @ApiModelProperty(position = 23, required = false, value = "ISBN，针对CD/图书等[100]")
     private String skuIsbn;
     @ApiModelProperty(position = 24, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    @NotBlank(message = "购买限制不能为空")
     @Pattern(regexp = "\\b(0|1|2)\\b", message = "购买限制参数无效")
     private String buyFactor;
     @ApiModelProperty(position = 25, required = false, value = "购买限制人员名单，购买限制为2-指定用户时必填")
@@ -75,7 +80,7 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     @ApiModelProperty(position = 30, required = false, value = "加减库存")
     private Integer operStock;
 
-    public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() {
+    public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo(GoblinGoodsSkuInfoVo mgtGoodsSkuInfoVo) {
         GoblinGoodsSkuInfoVo goodsSkuInfoVo = GoblinGoodsSkuInfoVo.getNew();
         List<GoblinGoodsSpecDto> skuSpecList = this.getSkuSpecList();
         if (!CollectionUtils.isEmpty(skuSpecList)) {
@@ -84,19 +89,21 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
                 goodsSkuInfoVo.setName(goodsSkuInfoVo.getName().concat(goblinGoodsSpecDto.getSpecVname()));
             }
             goodsSkuInfoVo.setSkuSpecList(skuSpecList);
+        } else {
+            goodsSkuInfoVo.setName(mgtGoodsSkuInfoVo.getName());
+            goodsSkuInfoVo.setSkuSpecList(mgtGoodsSkuInfoVo.getSkuSpecList());
         }
         goodsSkuInfoVo.setSkuId(this.getSkuId());
         goodsSkuInfoVo.setSkuPic(this.getSkuPic());
-        goodsSkuInfoVo.setSkuSpecList(skuSpecList);
-        goodsSkuInfoVo.setSellPrice(this.getSellPrice());
+        goodsSkuInfoVo.setSellPrice(null == this.getSellPrice() ? mgtGoodsSkuInfoVo.getSellPrice() : this.getSellPrice());
         goodsSkuInfoVo.setPrice(this.getPrice());
         goodsSkuInfoVo.setPriceMember(this.getPriceMember());
-        goodsSkuInfoVo.setWeight(this.getWeight());
+        goodsSkuInfoVo.setWeight(null == this.getWeight() ? mgtGoodsSkuInfoVo.getWeight() : this.getWeight());
         goodsSkuInfoVo.setStock(this.getStock());
         goodsSkuInfoVo.setSkuStock(this.getSkuStock());
         goodsSkuInfoVo.setWarningStock(this.getWarningStock());
         goodsSkuInfoVo.setSkuAppear(this.getSkuAppear());
-        goodsSkuInfoVo.setSkuIsbn(this.getSkuIsbn());
+        goodsSkuInfoVo.setSkuIsbn(null == this.getSkuIsbn() ? mgtGoodsSkuInfoVo.getSkuIsbn() : this.getSkuIsbn());
         goodsSkuInfoVo.setBuyFactor(this.getBuyFactor());
         goodsSkuInfoVo.setBuyRoster(this.getBuyRoster());
         goodsSkuInfoVo.setBuyLimit(this.getBuyLimit());

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

@@ -51,12 +51,13 @@ public interface IGoblinstoreMgtGoodsService {
      *
      * @param uid                  UID
      * @param mgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
+     * @param mgtGoodsSkuInfoVo    GoblinGoodsSkuInfoVo
      * @param goodsInfoVo          GoblinGoodsInfoVo
      * @param delSpuSpecMap        Map<String, String>
      * @param addSpuSpecMap        Map<String, String>
      * @return boolean
      */
-    boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam mgtGoodsEditSkuParam,
+    boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam mgtGoodsEditSkuParam, GoblinGoodsSkuInfoVo mgtGoodsSkuInfoVo,
                          GoblinGoodsInfoVo goodsInfoVo, Map<String, String> delSpuSpecMap, Map<String, String> addSpuSpecMap);
 
     /**

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

@@ -475,6 +475,7 @@ public class GoblinStoreMgtGoodsController {
         }
         mgtGoodsEditSkuParam.setStock(mgtGoodsSkuInfoVo.getStock());
         mgtGoodsEditSkuParam.setSkuStock(mgtGoodsSkuInfoVo.getSkuStock());
+        mgtGoodsEditSkuParam.setWarningStock(mgtGoodsSkuInfoVo.getWarningStock());
         Integer operStock = mgtGoodsEditSkuParam.getOperStock();
         if (null != operStock && operStock != 0) {// 处理库存
             int operStockVal = Math.abs(operStock);
@@ -598,7 +599,7 @@ public class GoblinStoreMgtGoodsController {
         if (!mgtGoodsEditSkuParam.getBuyFactor().equals("2") || StringUtils.equals(befBuyRoster, buyRoster) || !buyRoster.startsWith("http")) {
             mgtGoodsEditSkuParam.setBuyRoster(null);
         }
-        if (goblinstoreMgtGoodsService.goodsEditSku(currentUid, mgtGoodsEditSkuParam, goodsInfoVo, delSpuSpecMap, addSpuSpecMap)) {
+        if (goblinstoreMgtGoodsService.goodsEditSku(currentUid, mgtGoodsEditSkuParam, mgtGoodsSkuInfoVo, goodsInfoVo, delSpuSpecMap, addSpuSpecMap)) {
             mgtGoodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(paramSkuId);
             mgtGoodsSkuInfoVo.setSurplusStock(goblinRedisUtils.getSkuStock(null, paramSkuId));
             return ResponseDto.success(mgtGoodsSkuInfoVo);

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

@@ -530,11 +530,11 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam mgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo,
-                                Map<String, String> delSpuSpecMap, Map<String, String> addSpuSpecMap) {
+    public boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam mgtGoodsEditSkuParam, GoblinGoodsSkuInfoVo mgtGoodsSkuInfoVo,
+                                GoblinGoodsInfoVo goodsInfoVo, Map<String, String> delSpuSpecMap, Map<String, String> addSpuSpecMap) {
         LocalDateTime now = LocalDateTime.now();
 
-        GoblinGoodsSkuInfoVo updateSkuInfoVo = mgtGoodsEditSkuParam.initEditGoodsSkuInfoVo();
+        GoblinGoodsSkuInfoVo updateSkuInfoVo = mgtGoodsEditSkuParam.initEditGoodsSkuInfoVo(mgtGoodsSkuInfoVo);
         updateSkuInfoVo.setUpdatedBy(uid);
         updateSkuInfoVo.setUpdatedAt(now);
         String skuId = updateSkuInfoVo.getSkuId();