From 7f8a658143f8e10585dd8e4ffd7ae661060b10b4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 9 Aug 2024 14:37:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8B=E6=9E=B6=E8=A7=84=E6=A0=BC=E6=9C=AA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 4cf1087..491aea6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -242,8 +242,10 @@ public class ProductService {
             // 提取所有 value 的列表
             for (int i = 0; i < tagSnaps.size(); i++) {
                 JSONObject jsonObject = tagSnaps.getJSONObject(i);
-                String[] values = jsonObject.getString("value").split(",");
-                valuesList.add(Arrays.asList(values));
+                if (jsonObject.containsKey("value")) {
+                    String[] values = jsonObject.getString("value").split(",");
+                    valuesList.add(Arrays.asList(values));
+                }
             }
             // 生成所有可能的排列组合
             generateCombinations(valuesList, 0, new ArrayList<>(), result);
@@ -305,7 +307,7 @@ public class ProductService {
                 TbProductSkuResult skuResult = tbProductSkuResultMapper.selectByPrimaryKey(it.getId());
 
                 // 上下架对应的sku
-                HashSet<String> specSet = new HashSet<>();
+//                HashSet<String> specSet = new HashSet<>();
                 AtomicDouble sum = new AtomicDouble(0.0);
                 BigDecimal lowerPrice = null;
                 for (TbProductSku item : tbProductSkus) {
@@ -317,9 +319,9 @@ public class ProductService {
                     }
 
                     String specSnap = item.getSpecSnap();
-                    if (specSnap != null) {
-                        specSet.addAll(Arrays.asList(specSnap.split(",")));
-                    }
+//                    if (specSnap != null) {
+//                        specSet.addAll(Arrays.asList(specSnap.split(",")));
+//                    }
                 }
                 //销量
                 it.setStockNumber(sum.intValue());
@@ -328,32 +330,32 @@ public class ProductService {
                 }
                 //售价
                 it.setLowPrice(lowerPrice);
-                String tagSnap = skuResult != null ? skuResult.getTagSnap() : null;
-                if (tagSnap != null) {
-                    JSONArray tagSnaps = JSONObject.parseArray(tagSnap);
-                    JSONObject snapJSON;
-                    JSONArray finalSnap = new JSONArray();
-                    for (Object snap : tagSnaps) {
-                        snapJSON = (JSONObject) snap;
-                        String values = snapJSON.getString("value");
-                        String finalValues = "";
-                        if (StrUtil.isNotBlank(values)) {
-                            String[] valueList = values.split(",");
-                            for (String value : valueList) {
-                                if (specSet.contains(value)) {
-                                    finalValues = finalValues + (value) + ",";
-                                }
-                            }
-                            if (StrUtil.isNotBlank(finalValues)) {
-                                finalValues = StrUtil.removeSuffix(finalValues, ",");
-                                snapJSON.put("value", finalValues);
-                                finalSnap.add(snapJSON);
-                            }
-                        }
-                    }
-                    //sku Result
-                    skuResult.setTagSnap(finalSnap.toJSONString());
-                }
+//                String tagSnap = skuResult != null ? skuResult.getTagSnap() : null;
+//                if (tagSnap != null) {
+//                    JSONArray tagSnaps = JSONObject.parseArray(tagSnap);
+//                    JSONObject snapJSON;
+//                    JSONArray finalSnap = new JSONArray();
+//                    for (Object snap : tagSnaps) {
+//                        snapJSON = (JSONObject) snap;
+//                        String values = snapJSON.getString("value");
+//                        String finalValues = "";
+//                        if (StrUtil.isNotBlank(values)) {
+//                            String[] valueList = values.split(",");
+//                            for (String value : valueList) {
+//                                if (specSet.contains(value)) {
+//                                    finalValues = finalValues + (value) + ",";
+//                                }
+//                            }
+//                            if (StrUtil.isNotBlank(finalValues)) {
+//                                finalValues = StrUtil.removeSuffix(finalValues, ",");
+//                                snapJSON.put("value", finalValues);
+//                                finalSnap.add(snapJSON);
+//                            }
+//                        }
+//                    }
+//                    //sku Result
+//                    skuResult.setTagSnap(finalSnap.toJSONString());
+//                }
                 it.setProductSkuResult(skuResult);
             });
             return products;