~API:商品编辑:SKU删除:规格数据更新调整;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -14,6 +14,7 @@ public class CollectionUtil {
     private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
     private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
     private static final ArrayList<String> STRING_ARRAY_LIST = new ArrayList<>();
+    private static final HashSet<String> STRING_ARRAY_SET = new HashSet<>();
     private static final ArrayList<Integer> INTEGER_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<Object> OBJECT_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<BigDecimal> BIG_DECIMALS_ARRAY_LIST = new ArrayList<>();
@@ -52,6 +53,10 @@ public class CollectionUtil {
         return (ArrayList<String>) STRING_ARRAY_LIST.clone();
     }
 
+    public static HashSet<String> getStringArraySet() {
+        return (HashSet<String>) STRING_ARRAY_SET.clone();
+    }
+
     public static ArrayList<Integer> arrayListInteger() {
         return (ArrayList<Integer>) INTEGER_ARRAY_LIST.clone();
     }

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

@@ -757,7 +757,24 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         String spuId = goodsSkuInfoVo.getSpuId();
         String delSkuId = goodsSkuInfoVo.getSkuId();
 
-        mgtGoodsInfoVo.getSkuIdList().removeIf(r -> r.equals(delSkuId));
+        List<String> skuIdList = mgtGoodsInfoVo.getSkuIdList();
+        skuIdList.removeIf(r -> r.equals(delSkuId));
+
+        List<GoblinGoodsSkuInfoVo> goodsSkuInfoVos = goblinMongoUtils.getGoodsSkuInfoVos(skuIdList);
+        List<List<GoblinGoodsSpecDto>> remainSkuSpecDtoList = goodsSkuInfoVos.stream()
+                .filter(r -> r.getDelFlg().equals("0")).map(GoblinGoodsSkuInfoVo::getSkuSpecList).collect(Collectors.toList());
+        Map<String, Set<String>> remainSkuSpecMap = new HashMap<>();
+        for (List<GoblinGoodsSpecDto> goblinGoodsSpecDtos : remainSkuSpecDtoList) {
+            for (GoblinGoodsSpecDto goblinGoodsSpecDto : goblinGoodsSpecDtos) {
+                String specName = goblinGoodsSpecDto.getSpecName(), specVname = goblinGoodsSpecDto.getSpecVname();
+                Set<String> specVnameSet = remainSkuSpecMap.get(specName);
+                if (CollectionUtils.isEmpty(specVnameSet)) {
+                    specVnameSet = CollectionUtil.getStringArraySet();
+                }
+                specVnameSet.add(specVname);
+                remainSkuSpecMap.put(specName, specVnameSet);
+            }
+        }
 
         List<GoblinGoodsSpecVo> specVoList = mgtGoodsInfoVo.getSpecVoList();
         Map<String, String> delGoodsSkuSpecMap = goodsSkuInfoVo.getSkuSpecList().stream()
@@ -767,21 +784,32 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             GoblinGoodsSpecVo specVo = specVoList.get(i);// 商品指定规格
             List<GoblinGoodsSpecValueVo> modifySpecValues = ObjectUtil.getGoblinGoodsSpecValueVoArrayList();
 
-            String delSpecVname = delGoodsSkuSpecMap.get(specVo.getSpecName());// 需要删除的SKU下指定规格的规格值
+            String specName = specVo.getSpecName();// 商品指定规格的名
+            Set<String> specVnameSet = remainSkuSpecMap.get(specName);// 剩余SKU指定规格的值集合
+            String delSpecVname = delGoodsSkuSpecMap.get(specName);// 需要删除的SKU下指定规格的规格值
             List<GoblinGoodsSpecValueVo> specValues = specVo.getSpecValues();// 商品指定规格下所有规格值
             Integer rmIdx = null;
+            specValues.sort(Comparator.comparing(GoblinGoodsSpecValueVo::getSpecVsort));
             for (GoblinGoodsSpecValueVo specValue : specValues) {// 遍历指定规格下每个规格值
-                if (specValue.getSpecVname().equals(delSpecVname)) {
-//                    modifySpecValues.remove(specValue);
-                    rmIdx = specValue.getSpecVsort();
-                    updateGoodsSpuSpecObjs.add(new Object[]{0, "1", spuId, specVo.getSpecName(), delSpecVname});
-                } else {
-                    modifySpecValues.add(specValue);
+                String specVname = specValue.getSpecVname();
+                int specVsort = specValue.getSpecVsort();
+
+                if (specVname.equals(delSpecVname)) {
+                    if (CollectionUtils.isEmpty(specVnameSet)) break;
+                    if (specVnameSet.contains(delSpecVname)) {// 剩余SKU指定规格的值集合，包含当前删除的规格值，则不做处理
+                        modifySpecValues.addAll(specValues);
+                        break;
+                    } else {// 剩余SKU指定规格的值集合，不包含当前删除的规格值，则可以删除且记录排序以处理其他规格值排序
+                        rmIdx = specVsort;
+                        updateGoodsSpuSpecObjs.add(new Object[]{0, "1", spuId, specName, delSpecVname});
+                        continue;
+                    }
                 }
-                if (null != rmIdx && specValue.getSpecVsort() > rmIdx) {
-                    specValue.setSpecVsort(specValue.getSpecVsort() - 1);
-                    updateGoodsSpuSpecObjs.add(new Object[]{specValue.getSpecVsort(), "0", spuId, specVo.getSpecName(), specValue.getSpecVname()});
+                if (null != rmIdx && specVsort > rmIdx) {
+                    specValue.setSpecVsort(specVsort - 1);
+                    updateGoodsSpuSpecObjs.add(new Object[]{specVsort, "0", spuId, specName, specVname});
                 }
+                modifySpecValues.add(specValue);
             }
             specVo.setSpecValues(modifySpecValues);
         }
@@ -795,15 +823,13 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         delSkuIdList = null == delSkuIdList ? CollectionUtil.arrayListString() : delSkuIdList;
         delSkuIdList.add(delSkuId);
         if (goblinMongoUtils.delGoodsSkuInfoVo(goodsSkuInfoVo, delSkuIdList)) {
-//            goblinRedisUtils.delGoodsSkuInfoVo(delSkuId);
-//            goblinRedisUtils.delGoodsSkuInfoVoByUnShelves(delSkuId);
             delSkuIdList.forEach(skuId -> {
                 goblinRedisUtils.delGoodsSkuInfoVo(skuId);
                 goblinRedisUtils.delGoodsSkuInfoVoByUnShelves(skuId);
             });
 
             BigDecimal priceGe = BigDecimal.ZERO, priceLe = BigDecimal.ZERO;
-            for (String skuId : mgtGoodsInfoVo.getSkuIdList()) {
+            for (String skuId : skuIdList) {
                 GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
                 if (null != skuInfoVo && skuInfoVo.getDelFlg().equals("0")) {
                     priceGe = priceGe.compareTo(BigDecimal.ZERO) == 0 ? skuInfoVo.getPrice() : (priceGe.compareTo(skuInfoVo.getPrice()) > 0 ? skuInfoVo.getPrice() : priceGe);

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

@@ -555,6 +555,10 @@ public class GoblinMongoUtils {
         return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId)),
                 GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
     }
+    public List<GoblinGoodsSkuInfoVo> getGoodsSkuInfoVos(List<String> skuIds) {
+        return mongoTemplate.find(Query.query(Criteria.where("skuId").in(skuIds)),
+                GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+    }
 
     // SKU信息
     public List<String> getMgtGoodsSkuIds(String storeId, List<String> spuIdList) {