From 37c93910375c390dece3ed9830b6dff8b3ea4a87 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Mar 2021 18:50:53 +0800
Subject: [PATCH] 20210319 当前持仓添加交易员InvitedId
---
src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java | 7 +++++++
src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html | 1 +
src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 19 ++++++++++++++++---
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
index 101feb2..d6537cc 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/entity/ContractHoldOrderEntity.java
@@ -105,6 +105,8 @@
* 1普通合约2跟单合约
*/
private int contractType;
+ public static final int CONTRACTTYPE_NORMAL = 1;
+ public static final int CONTRACTTYPE_FOLLOW = 2;
/**
* 开仓手续费
@@ -181,6 +183,11 @@
@TableField(exist = false)
private String inviteId;
/**
+ * 交易员邀请码
+ */
+ @TableField(exist = false)
+ private String inviteIdTrader;
+ /**
* 系统盈亏
*/
@TableField(exist = false)
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 a120891..8245317 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,7 +91,18 @@
String realName = firstName + secondName;
holdOrderEntity.setRealName(realName);
}
-
+ //如果是跟单合约，显示他的交易员的邀请码
+ int contractType = holdOrderEntity.getContractType();
+ 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())));
diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
index 7d70bb4..9d9478e 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -91,6 +91,7 @@
cols: [[
{field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
{field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+ {field: 'inviteIdTrader', title: '交易员邀请码', minWidth: 120,align:'left'},
{field: 'createTime', title: '时间', minWidth: 120,align:'center'},
{field: 'contractType', title: '合约类型',
templet: function (d) {
--
Gitblit v1.9.1