From 7cc2e1b6c6b1b8f8db88dd24fccd521a217e21c1 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 21 May 2021 19:43:12 +0800 Subject: [PATCH] modify --- src/main/resources/mapper/modules/ContractOrderMapper.xml | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml index dcf4039..94c17f4 100644 --- a/src/main/resources/mapper/modules/ContractOrderMapper.xml +++ b/src/main/resources/mapper/modules/ContractOrderMapper.xml @@ -20,10 +20,11 @@ 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> <if test="record != null" > @@ -35,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"> @@ -49,7 +53,8 @@ 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> <if test="record != null" > @@ -61,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"> @@ -159,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