From 9c82661351d23d6e588301eee5a0a6bdf76932d8 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Fri, 1 Nov 2024 10:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E4=BC=9A=E5=91=98=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 46 ++++++-------------
 1 file changed, 13 insertions(+), 33 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 8e844ad..20ef592 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -374,6 +374,7 @@ public class ProductService {
 //                HashSet<String> specSet = new HashSet<>();
                 AtomicDouble sum = new AtomicDouble(0.0);
                 BigDecimal lowerPrice = null;
+                BigDecimal lowMemberPrice = null;
                 for (TbProductSku item : tbProductSkus) {
                     if (item.getRealSalesNumber() != null) {
                         sum.addAndGet(item.getRealSalesNumber());
@@ -381,45 +382,24 @@ public class ProductService {
                     if (lowerPrice == null || lowerPrice.compareTo(item.getSalePrice()) > 0) {
                         lowerPrice = item.getSalePrice();
                     }
-
-                    String specSnap = item.getSpecSnap();
-//                    if (specSnap != null) {
-//                        specSet.addAll(Arrays.asList(specSnap.split(",")));
-//                    }
+                    if (lowMemberPrice == null || lowMemberPrice.compareTo(item.getMemberPrice()) > 0) {
+                        lowMemberPrice = item.getMemberPrice();
+                    }
                 }
-                //销量
+                // 销量
                 it.setStockNumber(sum.intValue());
+
+                // 售价
                 if (lowerPrice == null) {
                     lowerPrice = BigDecimal.ZERO;
                 }
-                //售价
                 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());
-//                }
+
+                // 会员价
+                if (lowMemberPrice == null) {
+                    lowMemberPrice = BigDecimal.ZERO;
+                }
+                it.setLowMemberPrice(lowMemberPrice);
                 it.setProductSkuResult(skuResult);
             });
             return products;