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/WalletBillRecordMapper.xml | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index 0d1a1ed..676d23e 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -37,5 +37,87 @@
</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 != ''">
+ 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 = #{type}
+ </if>
+ <if test="dto.orderNo != null and dto.orderNo != ''">
+ and o.order_no = like concat('%', #{orderNo}, '%')
+ </if>
+ <if test="dto.createStartDate!=null ">
+ <![CDATA[
+ AND w.create_time >= #{dto.createStartDate}
+ ]]>
+ </if>
+ <if test="dto.endEndDate!=null ">
+ <![CDATA[
+ AND w.create_time <= #{dto.endEndDate}
+ ]]>
+ </if>
+ <if test="dto.approveStartDate!=null ">
+ <![CDATA[
+ AND w.approve_time >= #{dto.approveStartDate}
+ ]]>
+ </if>
+ <if test="dto.approveEndDate!=null ">
+ <![CDATA[
+ AND w.approve_time <= #{dto.approveStartDate}
+ ]]>
+ </if>
+ order by t.create_time
+ </select>
+
+ <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 != ''">
+ 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 = #{type}
+ </if>
+ <if test="dto.orderNo != null and dto.orderNo != ''">
+ and o.order_no = like concat('%', #{orderNo}, '%')
+ </if>
+ <if test="dto.createStartDate!=null ">
+ <![CDATA[
+ AND w.create_time >= #{dto.createStartDate}
+ ]]>
+ </if>
+ <if test="dto.endEndDate!=null ">
+ <![CDATA[
+ AND w.create_time <= #{dto.endEndDate}
+ ]]>
+ </if>
+ <if test="dto.approveStartDate!=null ">
+ <![CDATA[
+ AND w.approve_time >= #{dto.approveStartDate}
+ ]]>
+ </if>
+ <if test="dto.approveEndDate!=null ">
+ <![CDATA[
+ AND w.approve_time <= #{dto.approveStartDate}
+ ]]>
+ </if>
+
+ order by t.create_time
+ </select>
</mapper>
--
Gitblit v1.9.3