From 4ff0a37e7ac7c24dffb044684f125c05f018436a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 30 十月 2024 13:25:14 +0800
Subject: [PATCH] 1.财务报表-销售额（原订单）调整

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

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index 597e240..ea5b876 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -15,9 +15,89 @@
         <result column="type" property="type" />
         <result column="type_detail" property="typeDetail" />
         <result column="transfer_id" property="transferId" />
+        <result column="method" property="method" />
         <result column="original_amount" property="originalAmount" />
         <result column="change_amount" property="changeAmount" />
         <result column="balance" property="balance" />
+        <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 ,w.approve_time as approveTime  from t_wallet_bill_record t
+        left join t_supplier_info s on t.supplier_id = s.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 != ''">
+            and s.name like concat('%', #{dto.supplierName}, '%')
+        </if>
+        <if test="dto.supplierId != null and dto.supplierId != ''">
+            and t.supplier_id = #{dto.supplierId}
+        </if>
+        <if test="dto.type != null and dto.type != ''">
+            and t.type = #{dto.type}
+        </if>
+        <if test="dto.orderNo != null and dto.orderNo != ''">
+            and t.order_no  like concat('%', #{dto.orderNo}, '%')
+        </if>
+        <if test="dto.createStartDate!=null ">
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
+        </if>
+        <if test="dto.endEndDate!=null ">
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
+        </if>
+        <if test="dto.approveStartDate!=null ">
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}
+        </if>
+        <if test="dto.approveEndDate!=null ">
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
+        </if>
+        order by t.create_time
+    </select>
+
+    <select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
+        select t.* , s.name supplierName, w.approve_time as approveTime from t_wallet_bill_record t
+        left join t_supplier_info s on t.supplier_id = s.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 != ''">
+            and s.name like concat('%', #{dto.supplierName}, '%')
+        </if>
+        <if test="dto.supplierId != null and dto.supplierId != ''">
+            and t.supplier_id = #{dto.supplierId}
+        </if>
+        <if test="dto.type != null and dto.type != ''">
+            and t.type = #{dto.type}
+        </if>
+        <if test="dto.orderNo != null and dto.orderNo != ''">
+            and t.order_no  like concat('%', #{dto.orderNo}, '%')
+        </if>
+        <if test="dto.createStartDate!=null ">
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &gt;= #{dto.createStartDate}
+        </if>
+        <if test="dto.endEndDate!=null ">
+            AND DATE_FORMAT(w.create_time, '%Y-%m-%d') &lt;= #{dto.endEndDate}
+        </if>
+        <if test="dto.approveStartDate!=null ">
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &gt;= #{dto.approveStartDate}
+        </if>
+        <if test="dto.approveEndDate!=null ">
+            AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
+        </if>
+        order by t.create_time
+    </select>
 </mapper>

--
Gitblit v1.9.3