From 440eb96980384c40756a2c52307e04c579fcf0c0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 13 Nov 2025 09:44:13 +0800
Subject: [PATCH] =?UTF-8?q?pad=20=E4=BC=9A=E5=91=98=E4=BB=B7?=
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 +
 .../service/account/service/impl/PadProdServiceImpl.java    | 6 +++++-
 .../service/order/service/impl/OrderInfoServiceImpl.java    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

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 917eadf43..199e6f06e 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 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 664cccb01..dc4ee099d 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
@@ -1,6 +1,7 @@
 package com.czg.service.account.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.czg.account.dto.pad.*;
@@ -27,6 +28,7 @@ import jakarta.annotation.Resource;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -34,6 +36,7 @@ import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 /**
  * @author Administrator
@@ -115,7 +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);
             });
             padDetailDTO.setProductList(products);
         }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index ea476fc21..1eaab7ea9 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -534,6 +534,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         orderInfo.setPackFee(packAmount.getPrice());
         //生成订单 //discount_info 所有折扣 几折 折扣金额 满减金额 优惠券金额 积分抵扣金额 抹零
         upOrderPayInfo(orderInfo, param);
+
+
+
+
+
         orderDetailService.updateBatch(orderDetails);
         return orderInfo;
     }