From 8eff6445ef97d920d61c60046aaf50e1b5be4d4e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 28 十月 2024 17:14:14 +0800
Subject: [PATCH] add: 钱包供应商财务

---
 src/main/resources/mapper/wallet/WalletBillRecordMapper.xml |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index a38744c..88825d4 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -22,10 +22,24 @@
         <result column="transfer_detail_id" property="transferDetailId" />
         <result column="open_id" property="openId" />
     </resultMap>
+    <select id="getPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
+        select *
+        from t_wallet_bill_record wbr
+        where wbr.DELETED=0
+        <if test="dto.supplierId != null and dto.supplierId != ''">
+            and wbr.supplier_id= #{dto.supplierId}
+        </if>
+        <if test="dto.startDate != null">
+            and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') &gt;= #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null">
+            and DATE_FORMAT(wbr.create_time, '%Y-%m-%d') &lt;= #{dto.endDate}
+        </if>
+
+    </select>
     <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
         select t.* ,s.name supplierName from t_wallet_bill_record t
         left join t_supplier_info s on t.supplier_id = s.id
-        left join t_order o on t.order_id = o.id
         left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
@@ -38,10 +52,10 @@
             and t.type = #{type}
         </if>
         <if test="dto.orderNo != null and dto.orderNo != ''">
-            and o.order_no = like concat('%', #{orderNo}, '%')
+            and torder_no = like concat('%', #{orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
-            <![CDATA[
+            <![CDATA[.
                AND w.create_time &gt;= #{dto.createStartDate}
             ]]>
         </if>
@@ -67,7 +81,6 @@
     <select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
         select t.* ,s.name supplierName from t_wallet_bill_record t
         left join t_supplier_info s on t.supplier_id = s.id
-        left join t_order o on t.order_id = o.id
         left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
@@ -80,7 +93,7 @@
             and t.type = #{type}
         </if>
         <if test="dto.orderNo != null and dto.orderNo != ''">
-            and o.order_no = like concat('%', #{orderNo}, '%')
+            and t.order_no = like concat('%', #{orderNo}, '%')
         </if>
         <if test="dto.createStartDate!=null ">
             <![CDATA[

--
Gitblit v1.9.3