From ddca8e96ee1aa47ba33fcf3a9a1e7e964d63ad8b Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 31 十月 2024 17:15:43 +0800 Subject: [PATCH] fix: 钱包供应商财务1 --- src/main/resources/mapper/wallet/WalletMapper.xml | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/wallet/WalletMapper.xml b/src/main/resources/mapper/wallet/WalletMapper.xml index d33cf32..51d5ce4 100644 --- a/src/main/resources/mapper/wallet/WalletMapper.xml +++ b/src/main/resources/mapper/wallet/WalletMapper.xml @@ -19,6 +19,32 @@ <result column="settling_amount" property="settlingAmount" /> <result column="total_deduction" property="totalDeduction" /> <result column="total_transaction_amount" property="totalTransactionAmount" /> + <result column="settled_amount" property="settledAmount" /> + </resultMap> + <select id="getWaittingSettlementAmount" resultType="java.math.BigDecimal"> + <include refid="supplier_settlement_amount"></include> + </select> + + <!-- 总交易额--> + <select id="getSupplierTotalTransactionAmount" resultType="java.math.BigDecimal"> + select IFNULL(sum(oi.supplier_price*oi.num),0) as cur_mon_supplier_amount + from t_order_item oi + left join t_order o + on oi.order_id = o.id + where oi.supplier_id = #{dto.supplierId} + and o.payment_time > #{dto.startTime} + </select> + + + <!-- 待结算--> + <sql id="supplier_settlement_amount"> + SELECT IFNULL(sum(settlement_amount),0) AS settlement_amount + FROM t_order_settlement OS + WHERE OS.DELETED=0 + AND OS.TYPE='supplier' + AND OS.status='PENDING' + AND USER_ID=#{dto.userId} + </sql> </mapper> -- Gitblit v1.9.3