From 2a916d05d9f14d583d89f77aed6f63fd49375f60 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 19 八月 2026 11:38:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.2' into 2.2
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index b5966f9..9d142f9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -136,8 +136,6 @@
private Logger log = LoggerFactory.getLogger(TChargingOrderServiceImpl.class);
private static final int WHITELIST_BENEFIT_ALL_FREE = 1;
- private static final int WHITELIST_BENEFIT_ELECTRIC_FREE = 2;
- private static final int WHITELIST_BENEFIT_SERVICE_FREE = 3;
private static final String SHARE_AFTER_COMMIT_RESOURCE_PREFIX = "chargingOrderShareAfterCommit:";
private static final String SPECIAL_REFUND_TITLE = "特殊退款处理";
private static final int RESERVATION_RECOMMENDATION_HISTORY_DAYS = 30;
@@ -774,9 +772,9 @@
* @return 数组下标0=电费减免，下标1=服务费减免
*/
private BigDecimal[] calculateWhitelistRefundSplit(TChargingOrder chargingOrder, BigDecimal electrovalence, BigDecimal serviceCharge) {
- return ChargingCouponSupport.calculateWhitelistRefundSplit(
+ return ChargingCouponSupport.calculateWhitelistRefundSplitByBenefitType(
isWhitelistOrder(chargingOrder),
- isWhitelistAllFreeOrder(chargingOrder),
+ chargingOrder == null ? null : chargingOrder.getWhitelistBenefitType(),
electrovalence,
serviceCharge);
}
--
Gitblit v1.7.1