From c678953825053c8cbc5ea6b441aeeb2b9fc738d2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 八月 2026 16:29:02 +0800
Subject: [PATCH] 浣欓鏀粯涓嶅弬涓嶸IP浼氬憳鎶樻墸
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 9334ad6..a2b0242 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -552,8 +552,8 @@
BigDecimal originalServicePrice = detailOrder.getServiceCharge().multiply(subtract);
BigDecimal serviceCharge = originalServicePrice;
BigDecimal vipDiscountAmount = BigDecimal.ZERO;
- //计算优惠金额
- if (!isWhitelistOrder(order) && null != order.getVipDiscount()) {
+ //计算优惠金额；余额支付（含组合支付）不参与会员折扣
+ if (!isWhitelistOrder(order) && !isBalancePayMode(order.getPayMethod()) && null != order.getVipDiscount()) {
//0.58折
vipDiscountAmount = serviceCharge.multiply(new BigDecimal(1).subtract(order.getVipDiscount()));
serviceCharge = serviceCharge.multiply(order.getVipDiscount());
--
Gitblit v1.7.1