From 2d2d58f78780767d8172081f8087ae412855527e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 十月 2026 13:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
index bd3b4eb..177c3df 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -179,6 +179,10 @@
}
AppUserWhitelistMatchVO whitelist = whitelistService.matchWhitelist(tokenService.getLoginUserApplet().getUserId(), chargingGun.getSiteId());
data.setWhitelistMatched(Boolean.TRUE.equals(whitelist.getMatched()));
+ if (Boolean.TRUE.equals(whitelist.getMatched())) {
+ // 充电页余额显示：按白名单所属公司账户模式下发账户可用余额（共享=公司余额，分配=白名单余额）
+ data.setWhitelistBalance(whitelistService.resolveWhitelistAccountBalance(whitelist));
+ }
// 白名单权益已下线（充电完全按企业优惠结算），不再下发权益类型与名称，仅保留命中标识
data.setWhitelistBenefitType(null);
data.setWhitelistBenefitName(null);
--
Gitblit v1.7.1