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

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

@@ -66,6 +66,8 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
         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());

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

@@ -145,10 +145,13 @@ public class GoblinStoreMgtGoodsController {
         if (log.isDebugEnabled()) {
             log.debug("商品管理:商品编辑:编辑SKU:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
         }
+        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);// 当前剩余库存
@@ -158,10 +161,12 @@ public class GoblinStoreMgtGoodsController {
                     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)) {