From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/resources/mapper/OrderEchoMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/OrderEchoMapper.xml b/src/main/resources/mapper/OrderEchoMapper.xml
index beedfe0..12eae6e 100644
--- a/src/main/resources/mapper/OrderEchoMapper.xml
+++ b/src/main/resources/mapper/OrderEchoMapper.xml
@@ -27,13 +27,15 @@
</sql>
- <select id="queryByUserId" resultMap="BaseResultMap">
+ <select id="queryByUserId" resultType="com.nq.pojo.OrderEchoOut">
select o.id,o.eid,o.return_of_rate,
- o.buy_time,o.end_time,o.user_id,o.state,o.money,e.title,e.return_time
+ FROM_UNIXTIME(o.buy_time/1000, '%Y-%m-%d %H:%i:%s') as buy_time,
+ FROM_UNIXTIME(o.end_time/1000, '%Y-%m-%d %H:%i:%s') as end_time,
+ o.user_id,o.state,o.money,e.title,e.return_time
from order_echo o
join echo e
on o.eid = e.id
- where user_id = #{id}
+ where user_id = #{id} GROUP BY o.buy_time desc
</select>
<select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">
--
Gitblit v1.9.3