Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -179,15 +179,19 @@ public class GoblinStoreMgtCouponController {
         switch (storeCouponBasicVo.getType()) {
             case "1":// 代金
                 storeCouponBasicVo.setValFace(mgtCouponAddParam.getValFace());
+                storeCouponBasicVo.setDeduction(mgtCouponAddParam.getValFace());
                 break;
             case "2":// 折扣
                 storeCouponBasicVo.setDiscount(mgtCouponAddParam.getDiscount());
                 storeCouponBasicVo.setDeduction(mgtCouponAddParam.getDeduction());
                 break;
             case "3":// 满减
+                if (null == mgtCouponAddParam.getTriggers()) {
+                    storeCouponBasicVo.setTriggers(mgtCouponAddParam.getValOver());
+                }
                 storeCouponBasicVo.setValOver(mgtCouponAddParam.getValOver());
                 storeCouponBasicVo.setValMinus(mgtCouponAddParam.getValMinus());
-                storeCouponBasicVo.setDeduction(mgtCouponAddParam.getDeduction());
+                storeCouponBasicVo.setDeduction(mgtCouponAddParam.getValMinus());
                 break;
         }
 
@@ -245,15 +249,19 @@ public class GoblinStoreMgtCouponController {
         switch (storeCouponBasicVo.getType()) {
             case "1":// 代金
                 storeCouponBasicVo.setValFace(mgtCouponEditParam.getValFace());
+                storeCouponBasicVo.setDeduction(mgtCouponEditParam.getValFace());
                 break;
             case "2":// 折扣
                 storeCouponBasicVo.setDiscount(mgtCouponEditParam.getDiscount());
                 storeCouponBasicVo.setDeduction(mgtCouponEditParam.getDeduction());
                 break;
             case "3":// 满减
+                if (null == mgtCouponEditParam.getTriggers()) {
+                    storeCouponBasicVo.setTriggers(mgtCouponEditParam.getValOver());
+                }
                 storeCouponBasicVo.setValOver(mgtCouponEditParam.getValOver());
                 storeCouponBasicVo.setValMinus(mgtCouponEditParam.getValMinus());
-                storeCouponBasicVo.setDeduction(mgtCouponEditParam.getDeduction());
+                storeCouponBasicVo.setDeduction(mgtCouponEditParam.getValMinus());
                 break;
         }
         storeCouponBasicVo.setStoreCouponId(storeCouponId);

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

@@ -336,7 +336,7 @@ public class GoblinStoreMgtGoodsController {
             boolean diffSpecFlg = false;
             for (GoblinGoodsSpecDto paramGoodsSpecDto : paramSkuSpecList) {// 入参规格逐个与当前商品所有SKU规格比对
                 String editBefSkuSpecVname = editBefSkuSpecMap.get(paramGoodsSpecDto.getSpecName());
-                if (null == editBefSkuSpecVname) {// 入参规格不存在于原SKU中，则参数有误
+                if (null == editBefSkuSpecVname) {// 入参规格名称不存在于原SKU中，则参数有误
                     log.warn("商品管理:商品编辑:SKU编辑:规格信息不一致[skuId={},editBefSkuSpecMap={},paramGoodsSpecDto={}]",
                             paramSkuId, editBefSkuSpecMap, paramGoodsSpecDto);
                     return ResponseDto.failure(ErrorMapping.get("149014"));

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

@@ -468,7 +468,6 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                 } else {
                     goblinRedisUtils.decrSkuStock(null, skuId, Math.abs(operStock));
                 }
-//                goblinRedisUtils.setSkuStock(null, skuId, updateSkuInfoVo.getSkuStock());
             }
             goblinRedisUtils.delGoodsSkuInfoVo(skuId);
 
@@ -476,8 +475,23 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             LinkedList<Object[]> initSpuSpecValueObjs = CollectionUtil.linkedListObjectArr();
             LinkedList<Object[]> delSpuSpecValueObjs = CollectionUtil.linkedListObjectArr();
             LinkedList<Object[]> updateSpuSpecValueObjs = CollectionUtil.linkedListObjectArr();
-            if (beUpdateSpuSpecFlg) {
+
             List<GoblinGoodsSpecVo> specVoList = goodsInfoVo.getSpecVoList();
+            List<GoblinGoodsSpecDto> skuSpecList = storeMgtGoodsEditSkuParam.getSkuSpecList();
+            skuSpecList.forEach(spec -> {
+                String specName = spec.getSpecName(), specVname = spec.getSpecVname();
+
+                GoblinGoodsSpecVo specVo = specVoList.stream().filter(r -> r.getSpecName().equals(specName)).findAny().get();
+                GoblinGoodsSpecValueVo specValueVo = specVo.getSpecValues().stream().filter(rv -> rv.getSpecVname().equals(specVname)).findAny().get();
+
+                initSpuSpecValueObjs.add(new Object[]{spuId, specName, specVname, specValueVo.getSpecVsort()});
+                updateSkuSpecValueObjs.add(new Object[]{specVname, skuId, specName});
+                if (!CollectionUtils.isEmpty(marketSkuIdList)) {
+                    marketSkuIdList.forEach(marketSkuId -> updateSkuSpecValueObjs.add(new Object[]{specVname, marketSkuId, specName}));
+                }
+            });
+
+            if (beUpdateSpuSpecFlg) {
                 for (GoblinGoodsSpecVo specVo : specVoList) {
                     List<GoblinGoodsSpecValueVo> specValues = specVo.getSpecValues();
                     specValues.sort(Comparator.comparing(GoblinGoodsSpecValueVo::getSpecVsort));
@@ -489,13 +503,6 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     }
                 }
 
-                List<GoblinGoodsSpecDto> skuSpecList = storeMgtGoodsEditSkuParam.getSkuSpecList();
-                skuSpecList.forEach(spec -> {
-                    String specName = spec.getSpecName(), specVname = spec.getSpecVname();
-                    GoblinGoodsSpecVo specVo = specVoList.stream().filter(r -> r.getSpecName().equals(specName)).findAny().get();
-                    GoblinGoodsSpecValueVo specValueVo = specVo.getSpecValues().stream().filter(rv -> rv.getSpecVname().equals(specVname)).findAny().get();
-                    initSpuSpecValueObjs.add(new Object[]{spuId, specName, specVname, specValueVo.getSpecVsort()});
-                });
                 if (!CollectionUtils.isEmpty(updateSpuSpecMap)) {// 更改了规格，需要同步SPU里的规格信息
                     goodsInfoVo.setUpdatedBy(uid);
                     goodsInfoVo.setUpdatedAt(now);