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 ate.trade_type = #{param.tradeType} @@ -249,6 +250,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ate.pay_state = #{param.payState} + + and atwd.wallet_type = #{param.walletType} + and ate.trade_time = ]]> #{param.startDateTime}