From 63607e10ec3f4a7d6264a52c3e783a98be68368d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 10 十一月 2024 00:29:32 +0800
Subject: [PATCH] 1.payment_time update
---
src/main/resources/mapper/wallet/WalletBillRecordMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml b/src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
index f71a580..5397612 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}, '%')
@@ -85,13 +88,14 @@
<if test="dto.approveEndDate!=null ">
AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{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}, '%')
--
Gitblit v1.9.3