From eb088bb750808ccc20ac9add87c2c2895fd3620a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 16:43:52 +0800
Subject: [PATCH] 20210323 后台保留两位小数，（平台数据除外）
---
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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..2d949d6 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
@@ -13,7 +13,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +21,8 @@
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.common.utils.CoinTypeConvert;
import com.xcong.excoin.common.utils.RedisUtils;
+import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
+import com.xcong.excoin.modules.documentary.mapper.FollowFollowerProfitMapper;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
@@ -41,7 +42,6 @@
import com.xcong.excoin.modules.trademanage.vo.PositionSettingVo;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
@@ -64,6 +64,8 @@
private final AgentReturnMapper agentReturnMapper;
private final MemberAuthenticationMapper memberAuthenticationMapper;
+
+ private final FollowFollowerProfitMapper followFollowerProfitMapper;
private final RedisUtils redisUtils;
@@ -89,8 +91,23 @@
String realName = firstName + secondName;
holdOrderEntity.setRealName(realName);
}
-
-
+ //如果是跟单合约，显示他的交易员的邀请码
+ int contractType = holdOrderEntity.getContractType();
+ Long holdOrderEntityMemberId = holdOrderEntity.getMemberId();
+ MemberEntity holdOrderEntityMember = memberMapper.selectById(holdOrderEntityMemberId);
+ Integer isTrader = holdOrderEntityMember.getIsTrader();
+ if(MemberEntity.ISTRADER_N == isTrader) {
+ if(ContractHoldOrderEntity.CONTRACTTYPE_FOLLOW == contractType) {
+ //获取对应的【follow_follower_profit】跟随者收益关系表
+ QueryWrapper<FollowFollowerProfitEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("member_id",holdOrderEntity.getMemberId());
+ FollowFollowerProfitEntity followFollowerProfitEntity = followFollowerProfitMapper.selectOne(queryWrapper);
+ Long tradeMemberId = followFollowerProfitEntity.getTradeMemberId();
+ MemberEntity selectByIdTrader = memberMapper.selectById(tradeMemberId);
+ String inviteId = selectByIdTrader.getInviteId();
+ holdOrderEntity.setInviteIdTrader(inviteId);
+ }
+ }
// 获取最新价
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));
BigDecimal lotNumber = holdOrderEntity.getSymbolSku();
@@ -1222,19 +1239,20 @@
}
positionSettingVo.setSumRewardAmount(sumRewardAmount);
}
- //升序
- List<PositionSettingVo> sortByProperty = CollUtil.sortByProperty(records, "sumRewardAmount");
//降序
- Collections.sort(sortByProperty, 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;
- }
- });
+// 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);
+// positionSettingVoIPage.setRecords(records);
return positionSettingVoIPage;
}
--
Gitblit v1.9.1