Merge branch 'dev_goblin' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev_goblin

 Conflicts:
	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

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

@@ -124,7 +124,11 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         } else {
             vo.setSpuId(this.getSpuId());
         }
-        vo.setSpuNo(IDGenerator.nextTimeId2());
+        if (StringUtils.isBlank(this.getSpuNo())) {
+            vo.setSpuNo(IDGenerator.nextTimeId2());
+        } else {
+            vo.setSpuNo(this.getSpuNo());
+        }
         vo.setName(this.getName());
         vo.setSubtitle(this.getSubtitle());
         vo.setSellPrice(this.getSellPrice());
@@ -164,6 +168,36 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         return vo;
     }
 
+    /**
+     * 编辑SPU参数整理
+     *
+     * @return GoblinGoodsInfoVo
+     */
+    public GoblinGoodsInfoVo initEditGoodsSkuInfoVo() {
+        GoblinGoodsInfoVo vo = GoblinGoodsInfoVo.getNew();
+        vo.setStoreId(this.getStoreId());
+        vo.setSpuId(this.getSpuId());
+        vo.setSpuNo(this.getSpuNo());
+        vo.setName(this.getName());
+        vo.setSubtitle(this.getSubtitle());
+        vo.setSellPrice(this.getSellPrice());
+        vo.setIntro(this.getIntro());
+        vo.setDetails(this.getDetails());
+        vo.setCoverPic(this.getCoverPic());
+        vo.setVideo(this.getVideo());
+        vo.setSpecMode(this.getSpecMode());
+        vo.setCateFid(this.getCateFid());
+        vo.setCateSid(this.getCateSid());
+        vo.setCateTid(this.getCateTid());
+        vo.setShelvesHandle(this.getShelvesHandle());
+        vo.setShelvesTime(this.getShelvesTime());
+        vo.setSpuValidity(this.getSpuValidity());
+        vo.setVirtualFlg(this.getVirtualFlg());
+        vo.setImageList(this.getImageList());
+        vo.setLogisticsTemplate(this.getLogisticsTemplate());
+        return vo;
+    }
+
     /**
      * 生成SKU列表以及SPU规格等信息
      *
@@ -189,7 +223,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
                 vo.setSkuId(skuId);
             }
             vo.setSpuId(goodsInfoVo.getSpuId());
-            vo.setSkuNo(goodsInfoVo.getSpuNo().concat("-").concat(String.valueOf(i)));
+//            vo.setSkuNo(goodsInfoVo.getSpuNo().concat("-").concat(String.valueOf(i)));
             vo.setName(goodsInfoVo.getName());
             vo.setSubtitle(goodsInfoVo.getSubtitle());
             vo.setSkuPic(addSkuParam.getSkuPic());

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.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,23 +35,46 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     private BigDecimal weight;
     @ApiModelProperty(position = 18, required = true, value = "总库存")
     private Integer stock;
-    @ApiModelProperty(position = 19, required = false, value = "预警库存")
+    @ApiModelProperty(position = 19, required = true, value = "SKU库存")
+    private Integer skuStock;
+    @ApiModelProperty(position = 20, required = false, value = "预警库存")
     private Integer warningStock;
-    @ApiModelProperty(position = 20, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
+    @ApiModelProperty(position = 21, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String skuAppear;
-    @ApiModelProperty(position = 21, required = false, value = "ISBN，针对CD/图书等[100]")
+    @ApiModelProperty(position = 22, required = false, value = "ISBN，针对CD/图书等[100]")
     private String skuIsbn;
-    @ApiModelProperty(position = 22, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
+    @ApiModelProperty(position = 23, required = true, value = "购买限制[0-全部用户|1-仅会员|2-指定用户]")
     private String buyFactor;
-    @ApiModelProperty(position = 23, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
+    @ApiModelProperty(position = 24, required = false, value = "购买限制人员名单[购买限制为2-指定用户时必填]")
     private String buyRoster;
-    @ApiModelProperty(position = 24, required = false, value = "限量[0-无限制|X:限购数量]")
+    @ApiModelProperty(position = 25, required = false, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
-    @ApiModelProperty(position = 25, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
+    @ApiModelProperty(position = 26, required = false, value = "单品有效期[yyyy-MM-dd HH:mm:ss]")
     @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "单品有效期格式有误")
     private String skuValidity;
 
 
-    @ApiModelProperty(position = 26, required = false, value = "加减库存")
+    @ApiModelProperty(position = 27, required = false, value = "加减库存")
     private Integer operStock;
+
+    public GoblinGoodsSkuInfoVo initEditGoodsSkuInfoVo() {
+        GoblinGoodsSkuInfoVo vo = GoblinGoodsSkuInfoVo.getNew();
+        vo.setSkuId(this.getSkuId());
+        vo.setSkuPic(this.getSkuPic());
+        vo.setSkuSpecList(this.getSkuSpecList());
+        vo.setSellPrice(this.getSellPrice());
+        vo.setPrice(this.getPrice());
+        vo.setPriceMember(this.getPriceMember());
+        vo.setWeight(this.getWeight());
+        vo.setStock(this.getStock());
+        vo.setSkuStock(this.getSkuStock());
+        vo.setWarningStock(this.getWarningStock());
+        vo.setSkuAppear(this.getSkuAppear());
+        vo.setSkuIsbn(this.getSkuIsbn());
+        vo.setBuyFactor(this.getBuyFactor());
+        vo.setBuyRoster(this.getBuyRoster());
+        vo.setBuyLimit(this.getBuyLimit());
+        vo.setSkuValidity(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getSkuValidity()));
+        return vo;
+    }
 }

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

 package com.liquidnet.service.goblin.dto.manage.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +12,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "GoblinStoreCertificationVo", description = "店铺认证信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinStoreCertificationVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -7125674300755279796L;
     @ApiModelProperty(position = 11, value = "证件类型[1-二代居民身份证]")

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

 package com.liquidnet.service.goblin.dto.manage.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import io.swagger.annotations.ApiModel;
@@ -11,6 +12,7 @@ import java.util.List;
 
 @ApiModel(value = "GoblinStoreMgtGoodsInfoVo", description = "商品管理:商品详情信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinStoreMgtGoodsInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 4864134079879227233L;
     @ApiModelProperty(position = 11, value = "商品SPU详情")

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

@@ -8,7 +8,6 @@ import lombok.Data;
 
 @ApiModel(value = "GoblinStoreMgtThumbVo", description = "店铺简易信息列表")
 @Data
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinStoreMgtThumbVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -7808265282707179941L;
     @ApiModelProperty(position = 10, value = "店铺ID[64]")

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

 package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,6 +14,7 @@ import java.util.List;
 
 @ApiModel(value = "GoblinGoodsInfoVo", description = "商品SPU详情[不包含具体SKU，SKU详情参见'GoblinGoobsSkuInfoVo']")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -4712015317981742851L;
     @ApiModelProperty(position = 10, value = "店铺ID")

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import io.swagger.annotations.ApiModel;
@@ -15,6 +16,7 @@ import java.util.List;
 
 @ApiModel(value = "GoblinGoodsSkuInfoVo", description = "商品SKU信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 7139250447538358198L;
     @ApiModelProperty(position = 10, value = "商品单品ID")

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,6 +9,7 @@ import java.io.Serializable;
 
 @ApiModel(value = "GoblinServiceSupportVo", description = "服务保障信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinServiceSupportVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -6408263563025607959L;
     @ApiModelProperty(position = 10, value = "服务支持ID[30]")

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

@@ -33,15 +33,17 @@ public interface IGoblinstoreMgtGoodsService {
      * 商品管理:商品编辑:SPU编辑
      *
      * @param storeMgtGoodsAddParam GoblinStoreMgtGoodsAddParam
+     * @return boolean
      */
-    void goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
+    boolean goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
 
     /**
      * 商品管理:商品编辑:SKU编辑
      *
      * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
+     * @return boolean
      */
-    void goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam);
+    boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam);
 
     /**
      * 商品管理:商品编辑:SKU添加

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

 package com.liquidnet.service.goblin.controller;
 
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.dto.manage.vo.SyncOrderParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
 import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
 import com.liquidnet.service.goblin.service.IGoblinAppZhengzaiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Slf4j
@@ -36,4 +40,18 @@ public class GoblinAppOrderController {
     public ResponseDto<GoblinPayInnerResultVo> getZhengzaiMarketList(@RequestBody GoblinOrderParam param) {
         return goblinAppOrderService.checkOrder(param);
     }
+
+    @PostMapping("syncOrder")
+    @ApiOperation("支付回调")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
+        return null;
+    }
+
+//    @PostMapping("payAgain")
+//    @ApiOperation("再次支付")
+//    @ApiResponse(code = 200, message = "接口返回对象参数")
+//    public ResponseDto<GoblinPayInnerResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
+//        return null;
+//    }
 }

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

@@ -12,12 +12,16 @@ 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;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.service.manage.IGoblinstoreMgtGoodsService;
+import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +38,8 @@ import javax.validation.constraints.NotBlank;
 public class GoblinStoreMgtGoodsController {
     @Autowired
     IGoblinstoreMgtGoodsService goblinstoreMgtGoodsService;
+    @Autowired
+    GoblinRedisUtils goblinRedisUtils;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "SPU列表")
@@ -45,7 +51,7 @@ public class GoblinStoreMgtGoodsController {
         return ResponseDto.success(goblinstoreMgtGoodsService.goodsList(storeMgtGoodsFilterParam));
     }
 
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "SPU导出")
     @PostMapping("export")
     public void export(@Valid @RequestBody GoblinStoreMgtGoodsFilterParam storeMgtGoodsFilterParam) {
@@ -56,9 +62,35 @@ public class GoblinStoreMgtGoodsController {
         // TODO: 2021/12/28 zhanggb
     }
 
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "SPU管理")
+    @PostMapping("operate")
+    public ResponseDto<Object> action(@Valid @RequestBody GoblinStoreMgtGoodsActionParam storeMgtGoodsActionParam) {
+        if (log.isDebugEnabled()) {
+            log.debug("商品管理:管理SPU:[GoblinStoreMgtGoodsActionParam={}]", JsonUtils.toJson(storeMgtGoodsActionParam));
+        }
+        // TODO: 2021/12/28 zhanggb 逻辑校验
+
+        switch (storeMgtGoodsActionParam.getAction()) {
+            case "ONSHELVES":
+                goblinstoreMgtGoodsService.goodsOnshelves(storeMgtGoodsActionParam);
+                break;
+            case "UNSHELVE":
+                goblinstoreMgtGoodsService.goodsUnshelves(storeMgtGoodsActionParam);
+                break;
+            case "REMOVE":
+                goblinstoreMgtGoodsService.goodsRemove(storeMgtGoodsActionParam);
+                break;
+            default:
+                log.warn("Invalid operation[action={}]", storeMgtGoodsActionParam.getAction());
+                return ResponseDto.failure(ErrorMapping.get("149001"));
+        }
+        return ResponseDto.success();
+    }
+
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "SPU添加")
-    @PostMapping("add")
+    @PutMapping("add")
     public ResponseDto<Object> add(@Valid @RequestBody GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
         if (log.isDebugEnabled()) {
             log.debug("商品管理:添加SPU:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(storeMgtGoodsAddParam));
@@ -67,7 +99,7 @@ public class GoblinStoreMgtGoodsController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "SPU详情")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "商品ID"),
@@ -77,37 +109,84 @@ public class GoblinStoreMgtGoodsController {
         if (log.isDebugEnabled()) {
             log.debug("商品管理:SPU详情:[spuId={}]", spuId);
         }
-
         return ResponseDto.success(goblinstoreMgtGoodsService.goodsInfo(spuId));
     }
 
-    @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "商品编辑:SPU编辑")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "商品编辑:SPU编辑", notes = "只修改商品信息，不包含规格相关信息")
     @PostMapping("edit_spu")
     public ResponseDto<Object> editSpu(@Valid @RequestBody GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
+        if (StringUtils.isBlank(storeMgtGoodsAddParam.getStoreId())) {
+            return ResponseDto.failure(ErrorMapping.get("149002"));
+        }
+        if (StringUtils.isBlank(storeMgtGoodsAddParam.getSpuId()) || null == goblinRedisUtils.getGoodsInfoVo(storeMgtGoodsAddParam.getSpuId())) {
+            return ResponseDto.failure(ErrorMapping.get("149010"));
+        }
         if (log.isDebugEnabled()) {
             log.debug("商品管理:商品编辑:编辑SPU:[GoblinStoreMgtGoodsAddParam={}]", JsonUtils.toJson(storeMgtGoodsAddParam));
         }
-
-        goblinstoreMgtGoodsService.goodsEditSpu(storeMgtGoodsAddParam);
-        return ResponseDto.success();
+        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSpu(storeMgtGoodsAddParam));
     }
 
-    @ApiOperationSupport(order = 5)
-    @ApiOperation(value = "商品编辑:SKU编辑")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "商品编辑:SKU编辑", notes = "只修改单品信息，不包含商品信息")
     @PostMapping("edit_sku")
     public ResponseDto<Object> editSku(@Valid @RequestBody GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        if (StringUtils.isBlank(storeMgtGoodsEditSkuParam.getStoreId())) {
+            return ResponseDto.failure(ErrorMapping.get("149002"));
+        }
+        GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(storeMgtGoodsEditSkuParam.getSkuId());
+        if (StringUtils.isBlank(storeMgtGoodsEditSkuParam.getSkuId()) || null == goodsSkuInfoVo) {
+            return ResponseDto.failure(ErrorMapping.get("149011"));
+        }
+        GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(goodsSkuInfoVo.getSpuId());
+        // TODO: 2022/1/5 zhanggb +分类-ISBN校验
+
         if (log.isDebugEnabled()) {
             log.debug("商品管理:商品编辑:编辑SKU:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
         }
-
-        goblinstoreMgtGoodsService.goodsEditSku(storeMgtGoodsEditSkuParam);
-        return ResponseDto.success();
+        storeMgtGoodsEditSkuParam.setStock(goodsSkuInfoVo.getStock());
+        storeMgtGoodsEditSkuParam.setSkuStock(goodsSkuInfoVo.getSkuStock());
+        String skuId = storeMgtGoodsEditSkuParam.getSkuId();
+        Integer operStock = storeMgtGoodsEditSkuParam.getOperStock();
+        if (null != operStock && operStock != 0) {// 处理库存
+            int operStockVal = Math.abs(operStock);
+            Integer stock = goodsSkuInfoVo.getSkuStock();// 总库存
+            Integer skuStock = goodsSkuInfoVo.getSkuStock();// SKU总库存
+
+            int rtSkuStock = goblinRedisUtils.getSkuStock(null, skuId);// 当前剩余库存
+            if (operStock < 0 && rtSkuStock >= operStockVal) {// SKU实时库存充足时允许扣减
+                if (goblinRedisUtils.decrSkuStock(null, skuId, operStockVal) < 0) {// 过程中库存不足时，回滚库存，编辑无效
+                    goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                    return ResponseDto.failure(ErrorMapping.get("149012"));
+                } else {
+                    storeMgtGoodsEditSkuParam.setSkuStock(skuStock - operStockVal);
+                    storeMgtGoodsEditSkuParam.setStock(stock - operStockVal);
+                }
+            } else if (operStock > 0) {// 增加
+                goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                storeMgtGoodsEditSkuParam.setSkuStock(skuStock + operStockVal);
+                storeMgtGoodsEditSkuParam.setStock(stock + operStockVal);
+            }
+        }
+        if (goblinstoreMgtGoodsService.goodsEditSku(storeMgtGoodsEditSkuParam)) {
+            return ResponseDto.success(goblinRedisUtils.getGoodsSkuInfoVo(storeMgtGoodsEditSkuParam.getSkuId()));
+        } else {
+            if (null != operStock && operStock != 0) {// 处理库存:回滚
+                int operStockVal = Math.abs(operStock);
+                if (operStock > 0) {// 增加的减回去
+                    goblinRedisUtils.decrSkuStock(null, skuId, operStockVal);
+                } else {// 扣减的加回去
+                    goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                }
+            }
+            return ResponseDto.failure(ErrorMapping.get("149013"));
+        }
     }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "商品编辑:SKU添加")
-    @PostMapping("edit_sku/add")
+    @PutMapping("edit_sku/add")
     public ResponseDto<Object> editSkuAdd(@Valid @RequestBody GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
         if (log.isDebugEnabled()) {
             log.debug("商品管理:商品编辑:编辑SKU:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
@@ -117,7 +196,7 @@ public class GoblinStoreMgtGoodsController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "商品编辑:SKU删除")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
@@ -129,7 +208,7 @@ public class GoblinStoreMgtGoodsController {
         return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(skuId));
     }
 
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "商品编辑:SKU批改")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
@@ -144,30 +223,4 @@ public class GoblinStoreMgtGoodsController {
                                           @NotBlank(message = "批量修改属性值不能为空") String batFieldVal) {
         return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuBat(spuId, batField, batFieldVal));
     }
-
-    @ApiOperationSupport(order = 10)
-    @ApiOperation(value = "SPU管理")
-    @PostMapping("operate")
-    public ResponseDto<Object> action(@Valid @RequestBody GoblinStoreMgtGoodsActionParam storeMgtGoodsActionParam) {
-        if (log.isDebugEnabled()) {
-            log.debug("商品管理:管理SPU:[GoblinStoreMgtGoodsActionParam={}]", JsonUtils.toJson(storeMgtGoodsActionParam));
-        }
-        // TODO: 2021/12/28 zhanggb 逻辑校验
-
-        switch (storeMgtGoodsActionParam.getAction()) {
-            case "ONSHELVES":
-                goblinstoreMgtGoodsService.goodsOnshelves(storeMgtGoodsActionParam);
-                break;
-            case "UNSHELVE":
-                goblinstoreMgtGoodsService.goodsUnshelves(storeMgtGoodsActionParam);
-                break;
-            case "REMOVE":
-                goblinstoreMgtGoodsService.goodsRemove(storeMgtGoodsActionParam);
-                break;
-            default:
-                log.warn("Invalid operation[action={}]", storeMgtGoodsActionParam.getAction());
-                return ResponseDto.failure(ErrorMapping.get("149001"));
-        }
-        return ResponseDto.success();
-    }
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service.impl.manage;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsEditSkuParam;
@@ -73,7 +74,6 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     }
                     vo.setTagVoList(goodsTagVoList);
                 }
-
                 if (!goodsExtagIsEmpty) {
                     List<GoblinGoodsExtagVo> goodsExtagVoList = ObjectUtil.getGoblinGoodsExtagVoArrayList();
                     for (int i = 0; i < tagIdList.size(); i++) {
@@ -113,13 +113,25 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public void goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
-        // TODO: 2021/12/28 zhanggb
+    public boolean goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
+        GoblinGoodsInfoVo editGoodsSkuInfoVo = storeMgtGoodsAddParam.initEditGoodsSkuInfoVo();
+        if (goblinMongoUtils.updateGoodsInfoVo(editGoodsSkuInfoVo)) {
+            // TODO: 2022/1/5 zhanggb redis+sql
+
+            return true;
+        }
+        return false;
     }
 
     @Override
-    public void goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
-        // TODO: 2022/1/5 zhanggb
+    public boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+        GoblinGoodsSkuInfoVo editGoodsSkuInfoVo = storeMgtGoodsEditSkuParam.initEditGoodsSkuInfoVo();
+        if (goblinMongoUtils.updateGoodsSkuInfoVo(editGoodsSkuInfoVo)) {
+            // TODO: 2022/1/5 zhanggb redis+sql
+
+            return true;
+        }
+        return false;
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

 package com.liquidnet.service.goblin.util;
 
-import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtThumbVo;
 import com.liquidnet.service.goblin.dto.vo.*;
@@ -24,6 +24,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinSelfTagVo> goblinSelfTagVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsTagVo> goblinGoodsTagVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsExtagVo> goblinGoodsExtagVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsSpecDto> goblinGoodsSpecDtoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinMarketSpuListVo> goblinMarketSpuListVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinStorePurchaseSkuVo> goblinStorePurchaseSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfZhengzaiSkuVo> goblinSelfZhengzaiSkuVoArrayList = new ArrayList<>();
@@ -31,6 +32,7 @@ public class ObjectUtil {
     private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
     private static final ArrayList<GoblinGoodsInfoVo> goblinGoodsInfoVos = new ArrayList<>();
 
+
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
     public static PagedResult<GoblinStoreMgtGoodsListVo> getGoblinStoreMgtGoodsVoPagedResult() {
@@ -93,6 +95,10 @@ public class ObjectUtil {
         return (ArrayList<GoblinGoodsExtagVo>) goblinGoodsExtagVoArrayList.clone();
     }
 
+    public static ArrayList<GoblinGoodsSpecDto> getGoblinGoodsSpecDtoArrayList() {
+        return (ArrayList<GoblinGoodsSpecDto>) goblinGoodsSpecDtoArrayList.clone();
+    }
+
     public static ArrayList<GoblinMarketSpuListVo> getGoblinMarketSpuListVoArrayList() {
         return (ArrayList<GoblinMarketSpuListVo>) goblinMarketSpuListVoArrayList.clone();
     }

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

@@ -25,6 +25,9 @@
 149008=
 149009=
 149010=商品不存在，请核实
+149011=SKU不存在，请核实
+149012=SKU库存不足，请核实
+149013=SKU编辑失败