From dd546e75da894531dd3f5f49c5f12be9d06069f2 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 15 Jun 2026 14:31:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=BE=E7=BD=AE=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=E6=A1=A9vin=E5=90=AF=E5=8A=A8=E9=BB=98=E8=AE=A4=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunkuaichong/ConfirmStartChargingRequestHandler.java    | 6 +++++-
 .../jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java  | 5 +++++
 .../main/resources/mapper/pile/MemberBasicInfoMapper.xml    | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

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 770167427..c3dcef7ec 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
@@ -346,7 +346,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler {
         }
         dto.setConnectorCode(connectorCode);
         dto.setTransactionCode(transactionCode);
-        dto.setChargeAmount(new BigDecimal(accountBalance));
+        if (memberWalletVO.getDefaultChargeAmount() != null && memberWalletVO.getDefaultChargeAmount().compareTo(BigDecimal.ZERO) > 0) {
+            dto.setChargeAmount(memberWalletVO.getDefaultChargeAmount());
+        }else {
+            dto.setChargeAmount(new BigDecimal(accountBalance));
+        }
         dto.setPayMode(payMode);
         dto.setStartMode(StringUtils.equals("01", startMode) ? "2" : "5");
         dto.setMemberId(memberWalletVO.getMemberId());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java
index 2aa359606..edaf93b08 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/ConfirmStartChargingMemberVO.java
@@ -22,6 +22,11 @@ public class ConfirmStartChargingMemberVO {
      */
     private String plateNumber;
 
+    /**
+     * 默认充电金额
+     */
+    private BigDecimal defaultChargeAmount;
+
     /**
      * 本金金额
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
index 39316a9c6..8da3b1b1d 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
@@ -331,6 +331,7 @@
     <select id="queryMemberInfoByVinCode" resultType="com.jsowell.pile.vo.base.ConfirmStartChargingMemberVO">
         select
             t1.member_id as memberId,
+            t1.default_charge_amount as defaultChargeAmount,
             t2.license_plate_number as plateNumber,
             t3.principal_balance as principalBalance,
             t3.gift_balance as giftBalance