+API:商品编辑(SKU、SPU);

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

@@ -210,6 +210,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
             vo.setStatus("3");// 没有审核流程，默认通过
 //            vo.setReason();
             vo.setShelvesStatus("0");
+            vo.setSkuAppear(addSkuParam.getSkuAppear());
             vo.setSkuNo("0");
 //            vo.setShelvesAt();
             vo.setCreatedBy(goodsInfoVo.getCreatedBy());

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

@@ -44,4 +44,6 @@ public class GoblinStoreMgtGoodsAddSkuParam implements Serializable {
     @ApiModelProperty(position = 23, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
     @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误")
     private String skuValidity;
+    @ApiModelProperty(position = 24, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    private String skuAppear;
 }

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

+package com.liquidnet.service.goblin.dto.manage;
+
+import com.liquidnet.commons.lang.constant.LnsRegex;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "GoblinStoreMgtGoodsEditSkuParam", description = "商品管理:编辑商品:编辑/添加SKU入参")
+@Data
+public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
+    private static final long serialVersionUID = 6657596593310537491L;
+    @ApiModelProperty(position = 10, required = false, value = "单品ID[编辑时必传]")
+    private String skuId;
+    @ApiModelProperty(position = 11, required = true, value = "单品默认图片的url[256]")
+    private String skuPic;
+    @ApiModelProperty(position = 12, required = true, value = "单品规格信息")
+    private List<GoblinGoodsSpecDto> skuSpecList;
+    @ApiModelProperty(position = 13, required = false, value = "单品销售价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(position = 14, required = true, value = "单品价格[20,2]")
+    private BigDecimal price;
+    @ApiModelProperty(position = 15, required = true, value = "单品会员价格[20,2]")
+    private BigDecimal priceMember;
+    @ApiModelProperty(position = 16, required = false, value = "单品的重量[20,2]")
+    private BigDecimal weight;
+    @ApiModelProperty(position = 17, required = true, value = "总库存")
+    private Integer stock;
+    @ApiModelProperty(position = 18, required = false, value = "预警库存")
+    private Integer warningStock;
+    @ApiModelProperty(position = 19, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    private String skuAppear;
+    @ApiModelProperty(position = 20, required = false, value = "ISBN，针对CD/图书等[100]")
+    private String skuIsbn;
+    @ApiModelProperty(position = 21, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    private String buyFactor;
+    @ApiModelProperty(position = 22, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    private String buyRoster;
+    @ApiModelProperty(position = 23, required = false, value = "限量[0-无限制|X:限购数量]")
+    private Integer buyLimit;
+    @ApiModelProperty(position = 24, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误")
+    private String skuValidity;
+
+
+    @ApiModelProperty(position = 25, required = false, value = "加减库存")
+    private Integer operStock;
+}

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

@@ -38,6 +38,6 @@ public class GoblinStoreMgtGoodsListVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 22, value = "总库存")
     private Integer totalStock;
-    @ApiModelProperty(position = 23, value = "总销量")
-    private Integer totalSales;
+    @ApiModelProperty(position = 23, value = "剩余库存")
+    private Integer surplusStock;
 }

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

 package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import io.swagger.annotations.ApiModel;
@@ -82,6 +83,12 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 40, value = "单品规格信息")
     private List<GoblinGoodsSpecDto> skuSpecList;
 
+    /* -------------------------------- 只展示，不存储 -------------------------------- */
+
+    @ApiModelProperty(position = 50, value = "剩余库存")
+    @JsonIgnore
+    private Integer surplusStock;
+
     private static final GoblinGoodsSkuInfoVo obj = new GoblinGoodsSkuInfoVo();
 
     public static GoblinGoodsSkuInfoVo getNew() {

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

 package com.liquidnet.service.goblin.service.manage;
 
 import com.liquidnet.service.base.PagedResult;
-import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
-import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam;
+import com.liquidnet.service.goblin.dto.manage.*;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 
@@ -32,11 +30,41 @@ public interface IGoblinstoreMgtGoodsService {
     GoblinStoreMgtGoodsInfoVo goodsInfo(String spuId);
 
     /**
-     * 商品管理:编辑SPU
+     * 商品管理:商品编辑:编辑SPU
      *
      * @param storeMgtGoodsAddParam GoblinStoreMgtGoodsAddParam
      */
-    void goodsEdit(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
+    void goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
+
+    /**
+     * 商品管理:商品编辑:编辑SKU
+     *
+     * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
+     */
+    void goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam);
+
+    /**
+     * 商品管理:商品编辑:添加SKU
+     *
+     * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
+     */
+    void goodsEditSkuAdd(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam);
+
+    /**
+     * 商品管理:商品编辑:删除SKU
+     *
+     * @param skuId 单品ID
+     * @return boolean
+     */
+    boolean goodsEditSkuDel(String skuId);
+
+    /**
+     * 商品管理:商品编辑:批量修改SKU
+     *
+     * @param spuId
+     * @return
+     */
+    boolean goodsEditSkuBat(String spuId);
 
     /**
      * 商品管理:上架商品

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

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsEditSkuParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
@@ -22,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 
 @ApiSupport(order = 149003)
 @Api(tags = "商品管理")
@@ -55,7 +57,7 @@ public class GoblinStoreMgtGoodsController {
     }
 
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "添加SPU")
+    @ApiOperation(value = "SPU添加")
     @PostMapping("add")
     public ResponseDto<Object> add(@Valid @RequestBody GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
         if (log.isDebugEnabled()) {
@@ -71,7 +73,7 @@ public class GoblinStoreMgtGoodsController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "商品ID"),
     })
     @GetMapping("info")
-    public ResponseDto<GoblinStoreMgtGoodsInfoVo> detail(String spuId) {
+    public ResponseDto<GoblinStoreMgtGoodsInfoVo> info(String spuId) {
         if (log.isDebugEnabled()) {
             log.debug("商品管理:SPU详情:[spuId={}]", spuId);
         }
@@ -80,18 +82,71 @@ public class GoblinStoreMgtGoodsController {
     }
 
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "编辑SPU")
-    @PostMapping("edit")
-    public ResponseDto<Object> edit(@Valid @RequestBody GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
+    @ApiOperation(value = "商品编辑:SPU编辑")
+    @PostMapping("edit_spu")
+    public ResponseDto<Object> editSpu(@Valid @RequestBody GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
         if (log.isDebugEnabled()) {
-            log.debug("商品管理:编辑SPU:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(storeMgtGoodsAddParam));
+            log.debug("商品管理:商品编辑:编辑SPU:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(storeMgtGoodsAddParam));
         }
-        goblinstoreMgtGoodsService.goodsEdit(storeMgtGoodsAddParam);
+
+        goblinstoreMgtGoodsService.goodsEditSpu(storeMgtGoodsAddParam);
         return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "管理SPU")
+    @ApiOperation(value = "商品编辑:SKU编辑")
+    @PostMapping("edit_sku")
+    public ResponseDto<Object> editSku(@Valid @RequestBody GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        if (log.isDebugEnabled()) {
+            log.debug("商品管理:商品编辑:编辑SKU:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
+        }
+
+        goblinstoreMgtGoodsService.goodsEditSku(storeMgtGoodsEditSkuParam);
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "商品编辑:SKU添加")
+    @PostMapping("edit_sku/add")
+    public ResponseDto<Object> editSkuAdd(@Valid @RequestBody GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        if (log.isDebugEnabled()) {
+            log.debug("商品管理:商品编辑:编辑SKU:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
+        }
+
+        goblinstoreMgtGoodsService.goodsEditSkuAdd(storeMgtGoodsEditSkuParam);
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "商品编辑:SKU删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "skuId", value = "单品ID"),
+    })
+    @PostMapping("edit_sku/del")
+    public ResponseDto<Object> editSkuDel(@NotBlank(message = "店铺ID不能为空") String storeId,
+                                          @NotBlank(message = "单品ID不能为空") String skuId) {
+        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(skuId));
+    }
+
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "商品编辑:SKU批改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "商品ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batField", value = "批量修改属性"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batFieldVal", value = "批量修改属性值"),
+    })
+    @PostMapping("edit_sku/bat")
+    public ResponseDto<Object> editSkuBat(@NotBlank(message = "店铺ID不能为空") String storeId,
+                                          @NotBlank(message = "商品ID不能为空") String spuId,
+                                          @NotBlank(message = "批量修改属性不能为空") String batField,
+                                          @NotBlank(message = "批量修改属性值不能为空") String batFieldVal) {
+        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuBat(spuId));
+    }
+
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "SPU管理")
     @PostMapping("operate")
     public ResponseDto<Object> action(@Valid @RequestBody GoblinStoreMgtGoodsActionParam storeMgtGoodsActionParam) {
         if (log.isDebugEnabled()) {

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

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsEditSkuParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
@@ -112,10 +113,32 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public void goodsEdit(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
+    public void goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
         // TODO: 2021/12/28 zhanggb
     }
 
+    @Override
+    public void goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        // TODO: 2022/1/5 zhanggb
+    }
+
+    @Override
+    public void goodsEditSkuAdd(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        // TODO: 2022/1/5 zhanggb
+    }
+
+    @Override
+    public boolean goodsEditSkuDel(String skuId) {
+        // TODO: 2022/1/5 zhanggb
+        return false;
+    }
+
+    @Override
+    public boolean goodsEditSkuBat(String spuId) {
+        // TODO: 2022/1/5 zhanggb
+        return false;
+    }
+
     @Override
     public void goodsOnshelves(GoblinStoreMgtGoodsActionParam storeMgtGoodsActionParam) {
         // TODO: 2021/12/28 zhanggb

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties

@@ -16,7 +16,7 @@
 # 开放平台错误码
 149000=操作过于频繁，请稍后再试
 149001=无效操作
-149002=
+149002=无权操作该店铺，请核实
 149003=
 149004=
 149005=
@@ -24,7 +24,7 @@
 149007=
 149008=
 149009=
-149010=
+149010=商品不存在，请核实