From cfe81b28c817fe4543da6de5fa169ca1e69c7afd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 11:02:49 +0800
Subject: [PATCH] 20200714 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 3b89c26..b0c39a3 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -79,6 +79,47 @@
Page<AgentFriendRelationEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<AgentFriendRelationEntity> findmemberQuickBuySaleListInPage = agentFriendRelationMapper.findAgentFriendRelationListInPage(page, agentFriendRelationEntity);
List<AgentFriendRelationEntity> records = findmemberQuickBuySaleListInPage.getRecords();
+ List<AgentFriendRelationEntity> arraylist = new ArrayList<>();
+ if(records != null && records.size() > 0) {
+ for(AgentFriendRelationEntity agentFriendRelation : records) {
+ String inviteId = agentFriendRelation.getInviteId();
+ if("90457646".equals(inviteId)) {
+ //该邀请码下的所有代理
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("referer_id", "90457646");
+ List<AgentFriendRelationEntity> selectByMap = agentFriendRelationMapper.selectByMap(columnMap);
+
+ if(selectByMap != null && selectByMap.size() > 0) {
+ int i = 1;
+ for(AgentFriendRelationEntity agentFriendRelationEntityTeam : selectByMap){
+ agentFriendRelationEntityTeam.setTeam(i+"");
+ arraylist.add(agentFriendRelationEntityTeam);
+ String inviteIdTeam = agentFriendRelationEntityTeam.getInviteId();
+ // 当前邀请码下的所有代理MemberID
+ List<AgentFriendRelationEntity> lowLevelList = agentFriendRelationMapper.selectAgentFriendRelationByMap(inviteIdTeam);
+ if(lowLevelList != null && lowLevelList.size() > 0) {
+ for(AgentFriendRelationEntity lowLevelAgentFriendRelationEntity: lowLevelList) {
+ lowLevelAgentFriendRelationEntity.setTeam(i+"");
+ arraylist.add(lowLevelAgentFriendRelationEntity);
+ }
+ }
+ i++;
+ }
+ }
+ }
+ if(arraylist != null && arraylist.size() > 0) {
+ for(AgentFriendRelationEntity teamagentFriendRelationEntity : arraylist) {
+ if(inviteId.equals(teamagentFriendRelationEntity.getInviteId())) {
+ String team = teamagentFriendRelationEntity.getTeam();
+ agentFriendRelation.setTeam(team);
+ }
+ }
+ }
+ }
+ }
+
+
+
if(records != null && records.size() > 0) {
for(AgentFriendRelationEntity agentFriendRelation : records) {
@@ -405,18 +446,14 @@
memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
}
- MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
- memberAccountMoneyChangeEntity.setContent("提币");
- memberAccountMoneyChangeEntity.setMemberId(memberId);
- memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("withdraw_id", selectById.getId());
+ List<MemberAccountMoneyChangeEntity> selectByMap2 = memberAccountMoneyChangeMapper.selectByMap(columnMaps);
+
+ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
- memberAccountMoneyChangeEntity.setSymbol(selectById.getSymbol());
- memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
- memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setCreateTime(new Date());
- memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setUpdateTime(new Date());
- memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
+ memberAccountMoneyChangeEntity.setAmount(selectById.getAmount().negate());
+ memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_Y);
memberCoinWithdrawMapper.updateById(selectById);
@@ -446,7 +483,7 @@
// 查询币币钱包
MemberWalletCoinEntity walletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId, symbol);
- BigDecimal available = walletCoin.getAvailableBalance().add(selectById.getAmount()).add(selectById.getFeeAmount());
+ BigDecimal available = walletCoin.getAvailableBalance().add(selectById.getAmount());
walletCoin.setAvailableBalance(available);
BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
walletCoin.setFrozenBalance(frozen);
@@ -454,18 +491,14 @@
memberWalletCoinMapper.updateById(walletCoin);
// 提币退款记录
- MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
- memberAccountMoneyChangeEntity.setContent("提币");
- memberAccountMoneyChangeEntity.setMemberId(memberId);
- memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
+ Map<String, Object> columnMaps = new HashMap<>();
+ columnMaps.put("withdraw_id", selectById.getId());
+ List<MemberAccountMoneyChangeEntity> selectByMap2 = memberAccountMoneyChangeMapper.selectByMap(columnMaps);
+
+ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_FAIL_INTEGER);
- memberAccountMoneyChangeEntity.setSymbol(selectById.getSymbol());
- memberAccountMoneyChangeEntity.setType(MemberAccountMoneyChangeEntity.TYPE_WALLET_COIN);
- memberAccountMoneyChangeEntity.setCreateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setCreateTime(new Date());
- memberAccountMoneyChangeEntity.setUpdateBy(selectById.getCreateBy());
- memberAccountMoneyChangeEntity.setUpdateTime(new Date());
- memberAccountMoneyChangeMapper.insert(memberAccountMoneyChangeEntity);
+ memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
+ memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_N);
memberCoinWithdrawMapper.updateById(selectById);
@@ -527,8 +560,10 @@
String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
//平仓总手续费
String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+
//总盈亏
String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+
//持仓人数
String notNullNumber = memberMapper.selectSFCCForBasicRealData();
//币币账户不为空的人数
@@ -610,7 +645,7 @@
//添加币币资金划转历史记录
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
- memberAccountMoneyChangeEntity.setContent("转入币币账户");
+ memberAccountMoneyChangeEntity.setContent("充值");
memberAccountMoneyChangeEntity.setMemberId(memberId);
memberAccountMoneyChangeEntity.setAmount(amountUsdt);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
--
Gitblit v1.9.1