From aa7dcb819942e12691ace82eb6e584b1c6167d3d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 13 Nov 2025 11:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/product/vo/ProductVO.java           | 1 +
 .../czg/service/account/service/impl/PadProdServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/ProductMapper.xml               | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java
index 199e6f06e..7c7b9187b 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ProductVO.java
@@ -15,6 +15,7 @@ import java.util.List;
 @Data
 public class ProductVO extends Product {
     private BigDecimal lowPrice;
+    private Long unitName;
     private BigDecimal lowMemberPrice;
     private List<ProdSku> skuList;
     private Integer isSaleTime;
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
index dc4ee099d..f0d6efa8e 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PadProdServiceImpl.java
@@ -118,8 +118,8 @@ public class PadProdServiceImpl implements PadProdService {
                 List<ProdSku> skuList = prodSkuService.list(new QueryWrapper().eq(ProdSku::getProductId, item.getId()));
                 item.setSkuList(skuList);
                 item.setIsSaleTime(calcIsSaleTime(item.getDays(), item.getStartTime(), item.getEndTime()));
-                Optional<BigDecimal> lowMemberPriceIsPresent = skuList.stream().map(obj -> NumberUtil.nullToZero(obj.getMemberPrice())).min(BigDecimal::compareTo);
-                lowMemberPriceIsPresent.ifPresent(item::setLowMemberPrice);
+//                Optional<BigDecimal> lowMemberPriceIsPresent = skuList.stream().map(obj -> NumberUtil.nullToZero(obj.getMemberPrice())).min(BigDecimal::compareTo);
+//                lowMemberPriceIsPresent.ifPresent(item::setLowMemberPrice);
             });
             padDetailDTO.setProductList(products);
         }
diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
index c5999dd7c..67dceac71 100644
--- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
@@ -246,9 +246,10 @@
         where id = #{shopId}
     </select>
     <select id="productList" resultType="com.czg.product.vo.ProductVO">
-        select a.*, min(b.sale_price) as lowPrice
+        select a.*, min(b.sale_price) as lowPrice, min(b.member_price) as lowMemberPrice, unit.name as unitName
         from tb_product as a
         left join tb_prod_sku as b on a.id = b.product_id
+        left join tb_shop_prod_unit unit on a.unit_id=unit.id
         where a.shop_id = #{shopId}
         <if test="productIds != null">
             and a.id in