From 1ac5e899fd4ee9c3ab60639f8814f1d99fca763e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Mar 2021 16:43:26 +0800
Subject: [PATCH] 20210319 平仓加载中
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 9 +++++----
src/main/resources/mapper/modules/ContractOrderMapper.xml | 18 +++++++++++++-----
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
index 5c58113..a120891 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java
@@ -1222,17 +1222,18 @@
}
positionSettingVo.setSumRewardAmount(sumRewardAmount);
}
- //升序
- List<PositionSettingVo> sortByProperty = CollUtil.sortByProperty(records, "sumRewardAmount");
//降序
- Collections.sort(sortByProperty, new Comparator<PositionSettingVo>() {//调用sort()方法，并实现Comparator接口中的compare()方法
+ Collections.sort(records, new Comparator<PositionSettingVo>() {//调用sort()方法，并实现Comparator接口中的compare()方法
@Override
public int compare(PositionSettingVo lhs, PositionSettingVo rhs) {
int value = Integer.valueOf(rhs.getSumRewardAmount().intValue())
- Integer.valueOf(lhs.getSumRewardAmount().intValue());
return value;
}
- });
+ });
+ //升序
+ //CollUtil.sortByProperty(records, "sumRewardAmount");
+ //CollUtil.sortByProperty(records, "accountType");
}
positionSettingVoIPage.setRecords(records);
return positionSettingVoIPage;
diff --git a/src/main/resources/mapper/modules/ContractOrderMapper.xml b/src/main/resources/mapper/modules/ContractOrderMapper.xml
index dcf4039..4ab9f74 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">
--
Gitblit v1.9.1