From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 16:33:52 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/resources/mapper/wallet/WalletMapper.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletMapper.xml b/src/main/resources/mapper/wallet/WalletMapper.xml
index 1e737b1..51d5ce4 100644
--- a/src/main/resources/mapper/wallet/WalletMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletMapper.xml
@@ -22,5 +22,29 @@
         <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 &gt; #{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