From 03090c7e7d56bb5f425a729b48bde2596611e1ca Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 28 Apr 2024 17:02:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/pojo/OrderEchoOut.java | 42 +++++++++++++++++++++
src/main/java/com/nq/dao/OrderEchoMapper.java | 3 +
src/main/java/com/nq/service/IEchoServices.java | 3 +
src/main/java/com/nq/service/impl/EchoServices.java | 7 +--
src/main/resources/mapper/OrderEchoMapper.xml | 6 ++-
target/classes/mapper/OrderEchoMapper.xml | 6 ++-
6 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nq/dao/OrderEchoMapper.java b/src/main/java/com/nq/dao/OrderEchoMapper.java
index 06b4115..751b980 100644
--- a/src/main/java/com/nq/dao/OrderEchoMapper.java
+++ b/src/main/java/com/nq/dao/OrderEchoMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nq.pojo.OrderEchoBean;
+import com.nq.pojo.OrderEchoOut;
import com.nq.pojo.reponse.OrderEChoReponse;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -14,7 +15,7 @@
- List<OrderEchoBean> queryByUserId(Integer id);
+ List<OrderEchoOut> queryByUserId(Integer id);
List<OrderEChoReponse> queryAll();
diff --git a/src/main/java/com/nq/pojo/OrderEchoOut.java b/src/main/java/com/nq/pojo/OrderEchoOut.java
new file mode 100644
index 0000000..03defd8
--- /dev/null
+++ b/src/main/java/com/nq/pojo/OrderEchoOut.java
@@ -0,0 +1,42 @@
+package com.nq.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * @program: dabao
+ * @description:
+ * @create: 2024-04-28 16:58
+ **/
+@Data
+public class OrderEchoOut {
+
+ private Integer id;
+
+ private String eid;
+
+ private String returnOfRate;
+
+ private String buyTime;
+
+ private String endTime;
+
+
+ private String userId;
+
+
+ private String money;
+
+ private String state;
+
+ private String earnings;
+
+ private String returnTime;
+
+
+ private String title;
+
+}
diff --git a/src/main/java/com/nq/service/IEchoServices.java b/src/main/java/com/nq/service/IEchoServices.java
index 8c4d31f..5e5d436 100644
--- a/src/main/java/com/nq/service/IEchoServices.java
+++ b/src/main/java/com/nq/service/IEchoServices.java
@@ -2,6 +2,7 @@
import com.nq.pojo.EChoBean;
import com.nq.pojo.OrderEchoBean;
+import com.nq.pojo.OrderEchoOut;
import com.nq.pojo.reponse.OrderEChoReponse;
import javax.servlet.http.HttpServletRequest;
@@ -17,7 +18,7 @@
boolean buyECho(String eId, BigDecimal money, HttpServletRequest request);
- List<OrderEchoBean> queryOrderEcho(HttpServletRequest request);
+ List<OrderEchoOut> queryOrderEcho(HttpServletRequest request);
List<OrderEChoReponse> queryALLOrderEcho();
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 80d115b..3db3492 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -7,10 +7,7 @@
import com.nq.dao.UserAssetsMapper;
import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
-import com.nq.pojo.EChoBean;
-import com.nq.pojo.OrderEchoBean;
-import com.nq.pojo.User;
-import com.nq.pojo.UserAssets;
+import com.nq.pojo.*;
import com.nq.pojo.reponse.OrderEChoReponse;
import com.nq.service.IEchoServices;
import com.nq.service.IUserService;
@@ -85,7 +82,7 @@
}
@Override
- public List<OrderEchoBean> queryOrderEcho(HttpServletRequest request) {
+ public List<OrderEchoOut> queryOrderEcho(HttpServletRequest request) {
User user = this.iUserService.getCurrentRefreshUser(request);
if (user == null) {
return new ArrayList<>();
diff --git a/src/main/resources/mapper/OrderEchoMapper.xml b/src/main/resources/mapper/OrderEchoMapper.xml
index beedfe0..52d1b8f 100644
--- a/src/main/resources/mapper/OrderEchoMapper.xml
+++ b/src/main/resources/mapper/OrderEchoMapper.xml
@@ -27,9 +27,11 @@
</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
diff --git a/target/classes/mapper/OrderEchoMapper.xml b/target/classes/mapper/OrderEchoMapper.xml
index beedfe0..52d1b8f 100644
--- a/target/classes/mapper/OrderEchoMapper.xml
+++ b/target/classes/mapper/OrderEchoMapper.xml
@@ -27,9 +27,11 @@
</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
--
Gitblit v1.9.3