From a6afd8b397177669122a39d2addf41cffe3465d7 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 12 Jun 2025 15:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=93=8D=E4=BD=9C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/account/AccTradeMapper.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
index bb96287..1e2a6b3 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
@@ -236,12 +236,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ate.trade_state,
                ate.pay_state,
                ate.amount,
-               ate.wallet_bal_total as walletBal,
-               ate.fail_reason
+               ate.fail_reason,
+               atwd.wallet_bal
             FROM
         account_trade ate
                 LEFT JOIN sys_user su ON su.user_id = ate.user_id
                 LEFT JOIN sys_dept sd ON sd.dept_id = su.dept_id
+                LEFT JOIN account_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id
         <where>
             <if test="param.tradeType != null">
                 ate.trade_type = #{param.tradeType}
@@ -249,6 +250,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="param.payState != null">
                 and ate.pay_state = #{param.payState}
             </if>
+            <if test="param.walletType != null">
+                and atwd.wallet_type = #{param.walletType}
+            </if>
             <if test="param.startDateTime != null">
                 and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
             </if>