From b4ee4385502b18f1dd437ccc7c00da434c2c0f7e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 19 Nov 2025 12:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=A7=9B=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 04515e3e5..ce5f893d1 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
@@ -778,9 +778,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             } else {
                 if (orderDetail.getIsTimeDiscount() == 1 && isTimeDiscountShare) {
                     calculationAmount = calculationAmount.add(orderDetail.getUnitPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
-                } else if (isVipPrice && isVipShare) {
+                } else if (isVipPrice && orderDetail.getMemberPrice().compareTo(BigDecimal.ZERO) > 0 && isVipShare) {
                     calculationAmount = calculationAmount.add(orderDetail.getUnitPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
-                } else if (!isVipPrice && orderDetail.getIsTimeDiscount() == 0) {
+                } else if ((!isVipPrice || orderDetail.getMemberPrice().compareTo(BigDecimal.ZERO) <= 0) && orderDetail.getIsTimeDiscount() == 0) {
                     calculationAmount = calculationAmount.add(orderDetail.getPrice().multiply(num).setScale(2, RoundingMode.HALF_UP));
                 }
             }