From f85651f863363b7f494f421301de9d02e0ae79ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 11 十一月 2024 12:49:33 +0800
Subject: [PATCH] fix:调整花农结算报表订单状态；查询时间无效

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

diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index f71a580..37f7e00 100644
--- a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
+++ b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -26,8 +26,9 @@
         <result column="open_id" property="openId" />
     </resultMap>
     <select id="getPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
-        select *
+        select wbr.*, u.nick_name AS approveName
         from t_wallet_bill_record wbr
+        LEFT JOIN t_user u ON wbr.approve_by = u.id
         where wbr.DELETED=0
         <if test="dto.supplierId != null and dto.supplierId != ''">
             and wbr.supplier_id= #{dto.supplierId}
@@ -42,8 +43,9 @@
     </select>
 
     <select id="getPageByDesc" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO">
-        select *
+        select wbr.*, u.nick_name AS approveName
         from t_wallet_bill_record wbr
+        LEFT JOIN t_user u ON wbr.approve_by = u.id
         where wbr.DELETED=0
         <if test="dto.supplierId != null and dto.supplierId != ''">
             and wbr.supplier_id= #{dto.supplierId}
@@ -57,9 +59,10 @@
         order by wbr.create_time desc
     </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
+        select t.* ,s.name supplierName ,w.approve_time as approveTime ,u.nick_name AS approveName 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
+        LEFT JOIN t_user u ON t.approve_by = u.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
             and s.name like concat('%', #{dto.supplierName}, '%')
@@ -74,10 +77,10 @@
             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}
+            AND DATE_FORMAT(t.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}
+            AND DATE_FORMAT(t.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}
@@ -85,13 +88,14 @@
         <if test="dto.approveEndDate!=null ">
             AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') &lt;= #{dto.approveEndDate}
         </if>
-        order by t.create_time
+        order by t.create_time desc
     </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
+        select t.* , s.name supplierName, w.approve_time as approveTime, u.nick_name AS approveName 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
+        LEFT JOIN t_user u ON t.approve_by = u.id
         where t.deleted= 0
         <if test="dto.supplierName != null and dto.supplierName != ''">
             and s.name like concat('%', #{dto.supplierName}, '%')
@@ -106,10 +110,10 @@
             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}
+            AND DATE_FORMAT(t.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}
+            AND DATE_FORMAT(t.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}

--
Gitblit v1.9.3