From 9b233cbcc955c23d1be041deb2a0d0c575df7cbc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 06 Jan 2026 13:51:54 +0800
Subject: [PATCH] 代收,代付

---
 src/main/resources/mapper/OrderEchoMapper.xml |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/OrderEchoMapper.xml b/src/main/resources/mapper/OrderEchoMapper.xml
index 5e1484e..12eae6e 100644
--- a/src/main/resources/mapper/OrderEchoMapper.xml
+++ b/src/main/resources/mapper/OrderEchoMapper.xml
@@ -10,8 +10,8 @@
         <result column="end_time" property="endTime"/>
         <result column="user_id" property="userId"/>
         <result column="money" property="money"/>
-        <result column="return_time" property="returnTime"/>
         <result column="title" property="title"/>
+        <result column="return_time" property="returnTime"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -27,21 +27,24 @@
     </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 order_echo  o
-            join echo e
-            on o.eid = e.id
-            where user_id = #{id}
-    </select>
-
-    <select id="queryAll" resultMap="BaseResultMap">
-        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} GROUP BY o.buy_time desc
+    </select>
+
+    <select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">
+        select  o.id,o.eid,o.return_of_rate,
+                o.buy_time,o.end_time,o.user_id,o.state,o.money,o.earnings,e.title,u.phone
+        from order_echo  o
+                 join echo e
+                      on o.eid = e.id
+                 join  user u on u.id = o.user_id
     </select>
 
 

--
Gitblit v1.9.3