From 556717400f442495b77bbb16bbb4e1965763795f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Jul 2020 10:28:28 +0800
Subject: [PATCH] 20200715 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 127 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 66030ec..252d6fe 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) {
@@ -140,7 +181,16 @@
@Override
public IPage<MemberEntity> findMemberListInPage(MemberEntity memberEntity, QueryRequest request) {
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
- return this.baseMapper.selectMemberListInPage(page, memberEntity);
+ IPage<MemberEntity> selectMemberListInPage = this.baseMapper.selectMemberListInPage(page, memberEntity);
+ List<MemberEntity> records = selectMemberListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberEntity memberEntitys : records) {
+ String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
+ String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
+ memberEntitys.setRealName(firstName+secondName);
+ }
+ }
+ return selectMemberListInPage;
}
@Override
@@ -345,7 +395,17 @@
public IPage<MemberCoinWithdrawVo> findmemberWithdrawCoinListInPage(
MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
Page<MemberCoinWithdrawEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+
IPage<MemberCoinWithdrawVo> findmemberQuickBuySaleListInPage = memberCoinWithdrawMapper.findmemberWithdrawCoinListInPage(page, memberCoinWithdrawEntity);
+ List<MemberCoinWithdrawVo> records = findmemberQuickBuySaleListInPage.getRecords();
+ if(records != null && records.size() > 0) {
+ for(MemberCoinWithdrawVo memberCoinWithdrawVo : records) {
+ BigDecimal amount = memberCoinWithdrawVo.getAmount();
+ BigDecimal feeAmount = memberCoinWithdrawVo.getFeeAmount();
+ BigDecimal subtract = amount.subtract(feeAmount);
+ memberCoinWithdrawVo.setRealAmount(subtract);
+ }
+ }
return findmemberQuickBuySaleListInPage;
}
@@ -405,18 +465,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 +502,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 +510,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 +579,10 @@
String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
//平仓总手续费
String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+
//总盈亏
String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+
//持仓人数
String notNullNumber = memberMapper.selectSFCCForBasicRealData();
//币币账户不为空的人数
@@ -586,4 +640,53 @@
return new FebsResponse().data(selectByMap);
}
+
+ @Override
+ public FebsResponse addCoinConfirm(@Valid MemberEntity memberEntity) {
+
+ Long memberId = memberEntity.getId();
+ String walletCode = "USDT";
+ BigDecimal amountUsdt = memberEntity.getCoinNumber();
+
+ MemberEntity selectById = this.baseMapper.selectById(memberId);
+ if(ObjectUtils.isEmpty(selectById)) {
+ return new FebsResponse().message("用户已不存在");
+ }
+ //获取币币钱包
+ MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId,walletCode);
+ BigDecimal availableBalance = memberWalletCoinEntity.getAvailableBalance();
+ BigDecimal totalBalance = memberWalletCoinEntity.getTotalBalance();
+
+ memberWalletCoinEntity.setAvailableBalance(availableBalance.add(amountUsdt));
+ memberWalletCoinEntity.setTotalBalance(totalBalance.add(amountUsdt));
+ // 更新
+ memberWalletCoinMapper.updateById(memberWalletCoinEntity);
+
+ //添加币币资金划转历史记录
+ MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = new MemberAccountMoneyChangeEntity();
+ memberAccountMoneyChangeEntity.setContent("充值");
+ memberAccountMoneyChangeEntity.setMemberId(memberId);
+ memberAccountMoneyChangeEntity.setAmount(amountUsdt);
+ memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
+ memberAccountMoneyChangeEntity.setSymbol("USDT");
+ 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);
+ /**
+ * todo
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String chargeTime = format.format(memberQuickBuySaleEntity.getChargeTime()); // 将当前时间袼式化为指定的格式
+ String usdt = memberQuickBuySaleEntity.getAmountUsdt()+"USDT";
+ //发送短信提醒
+ String smsContent = "【Excoin】尊敬的用户您好！您于"+chargeTime+"充值"+usdt+"已成功到账，请您及时查收！订单号为："+memberChargeUsdt.getOrderCode()+"。";
+ SmsUtils.hxSmsSend(member.getPhone(), smsContent);
+
+ */
+ return new FebsResponse().success();
+ }
+
}
--
Gitblit v1.9.1