From 2a5a1e82a75a45809e1779c00960dd08a372a147 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Fri, 8 Aug 2025 09:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=85=E7=94=B5=E6=A1=A9?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E7=94=B3=E8=AF=B7=E5=85=85=E7=94=B5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfirmStartChargingRequestHandler.java   |  6 +++--
 .../mapper/pile/MemberBasicInfoMapper.xml     | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java
index 3c90289ed..3b7e90732 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java
@@ -395,8 +395,10 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
             return resultMap;
         }
 
-        // 如果总余额小于0, 则标示余额不足
-        if (memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) < 0) {
+        // 如果不是平台测试员, 并且也不是站点白名单, 并且总余额小于0, 则提示余额不足
+        if (!StringUtils.equals(Constants.ONE, memberWalletVO.getPlatformTesterFlag())
+                && !StringUtils.equals(Constants.ONE, memberWalletVO.getStationWhiteListFlag())
+                && memberWalletVO.getTotalBalance().compareTo(BigDecimal.ZERO) < 0) {
             resultMap.put("transactionCode", Constants.ILLEGAL_TRANSACTION_CODE);
             resultMap.put("accountBalance", accountBalance);
             resultMap.put("defeatReasonCode", "03");
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
index 21d78b576..61fd2b6ac 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
@@ -306,27 +306,25 @@
     <select id="queryMemberInfoByCardCode" resultType="com.jsowell.pile.vo.base.ConfirmStartChargingMemberVO">
         select
             t1.member_id as memberId,
-            t2.principal_balance as principalBalance,
-            t2.gift_balance as giftBalance
+            t3.principal_balance as principalBalance,
+            t3.gift_balance as giftBalance
         from member_basic_info t1
-        join member_wallet_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-        join pile_auth_card t3 on t1.member_id = t3.member_id and t3.del_flag = '0'
+        join pile_auth_card t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+        left join member_wallet_info t3 on t1.member_id = t3.member_id and t3.del_flag = '0' and t3.merchant_id = #{merchantId}
         where t1.del_flag = '0'
-        and t3.logic_card = #{cardCode,jdbcType=VARCHAR}
-        and t2.merchant_id = #{merchantId}
+        and t2.logic_card = #{cardCode,jdbcType=VARCHAR}
     </select>
 
     <select id="queryMemberInfoByVinCode" resultType="com.jsowell.pile.vo.base.ConfirmStartChargingMemberVO">
         select
             t1.member_id as memberId,
-            t3.license_plate_number as plateNumber,
-            t2.principal_balance as principalBalance,
-            t2.gift_balance as giftBalance
+            t2.license_plate_number as plateNumber,
+            t3.principal_balance as principalBalance,
+            t3.gift_balance as giftBalance
         from member_basic_info t1
-        join member_wallet_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-        join member_plate_number_relation t3 on t1.member_id = t3.member_id and t3.del_flag = '0'
+        join member_plate_number_relation t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+        left join member_wallet_info t3 on t1.member_id = t3.member_id and t3.del_flag = '0' and t3.merchant_id = #{merchantId}
         where t1.del_flag = '0'
-        and t3.vin_code = #{vinCode,jdbcType=VARCHAR}
-        and t2.merchant_id = #{merchantId}
+        and t2.vin_code = #{vinCode,jdbcType=VARCHAR}
     </select>
 </mapper>