From f91bfc50f9e933c4fb66e092f738cfc22eb87bb0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 14:38:14 +0800
Subject: [PATCH] 20210323 后台保留两位小数，（平台数据除外）
---
src/main/resources/mapper/modules/ContractOrderMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index c761ff6..94c17f4 100644
--- a/src/main/resources/mapper/modules/ContractOrderMapper.xml
+++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml
@@ -20,14 +20,13 @@
a.invite_id,
a.account_type,
a.create_time,
- a.pc_state,
+ a.pc_state,
CONCAT(b.first_name, b.second_name) realName
FROM
- member a
+ contract_hold_order c
+ LEFT JOIN member a ON a.id = c.member_id
LEFT JOIN member_authentication b ON a.id = b.member_id
<where>
- a.certify_status = 2
- and a.account_status = 1
<if test="record != null" >
<if test="record.accounts!=null and record.accounts!=''">
and (FIND_IN_SET(#{record.accounts}, a.referer_ids) or a.invite_id = #{record.accounts} )
@@ -37,7 +36,10 @@
</if>
</if>
</where>
- order by a.create_time desc
+ GROUP BY
+ c.member_id
+ ORDER BY
+ a.create_time DESC
</select>
<select id="getPositionSettingList" resultType="com.xcong.excoin.modules.trademanage.vo.PositionSettingVo">
@@ -51,11 +53,10 @@
a.pc_state,
CONCAT(b.first_name, b.second_name) realName
FROM
- member a
+ contract_hold_order c
+ LEFT JOIN member a ON a.id = c.member_id
LEFT JOIN member_authentication b ON a.id = b.member_id
<where>
- a.certify_status = 2
- and a.account_status = 1
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
and (a.phone = #{record.account} or a.email = #{record.account} or a.invite_id=#{record.account})
@@ -65,7 +66,10 @@
</if>
</if>
</where>
- order by a.create_time desc
+ GROUP BY
+ c.member_id
+ ORDER BY
+ a.create_time DESC
</select>
<select id="findHistoryOrderInfoAloneAllInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
@@ -163,10 +167,12 @@
<select id="findMemberHistoryOrderInfoInPage" resultType="com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity">
SELECT
- *
+ *,
+ CONCAT(b.first_name, b.second_name) realName
FROM
contract_order s
LEFT JOIN member m ON m.id = s.member_id
+ LEFT JOIN member_authentication b ON m.id = b.member_id
<where>
s.closing_type in (2,3,4,5,6,7,8,9)
<if test="record != null" >
--
Gitblit v1.9.1