From d4d70fe3a3a20f5fc29c9f37a1f89854a376597f Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期三, 16 九月 2026 18:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TChargingCardServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TChargingCardServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TChargingCardServiceImpl.java
index c5176b1..bb65003 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TChargingCardServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TChargingCardServiceImpl.java
@@ -281,6 +281,22 @@
}
@Override
+ public List<String> listDeductedOrderCodes(List<String> orderCodes) {
+ if (orderCodes == null || orderCodes.isEmpty()) {
+ return java.util.Collections.emptyList();
+ }
+ List<String> normalizedCodes = orderCodes.stream()
+ .filter(StringUtils::isNotEmpty)
+ .map(String::trim)
+ .filter(code -> !code.isEmpty())
+ .distinct()
+ .collect(java.util.stream.Collectors.toList());
+ return normalizedCodes.isEmpty()
+ ? java.util.Collections.emptyList()
+ : baseMapper.selectDeductedOrderCodes(normalizedCodes);
+ }
+
+ @Override
public ChargingCardDeductVO deductBalanceForCharging(ChargingCardDeductDTO dto) {
validateDeductRequest(dto);
try {
--
Gitblit v1.7.1