From a719b1c8617fa37b22c55307d20796cda14e3c7d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Jul 2020 16:53:36 +0800
Subject: [PATCH] 20200716 代码提交
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 3 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 cba4493..94374d3 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
@@ -1,11 +1,13 @@
package com.xcong.excoin.modules.member.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.Sms106Send;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
@@ -34,6 +36,7 @@
import lombok.RequiredArgsConstructor;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -44,6 +47,8 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +56,7 @@
* @author wzy
* @date 2020-06-10
**/
+@Slf4j
@Service
@RequiredArgsConstructor
public class MemberServiceImpl extends ServiceImpl<MemberMapper, MemberEntity> implements IMemberService {
@@ -79,6 +85,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 +187,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 +401,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;
}
@@ -411,10 +477,21 @@
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_SUCCESS_INTEGER);
+ memberAccountMoneyChangeEntity.setAmount(selectById.getAmount().negate());
memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_Y);
memberCoinWithdrawMapper.updateById(selectById);
+ MemberEntity memberEntity = memberMapper.selectById(memberId);
+ String phone = memberEntity.getPhone();
+ //String email = memberEntity.getEmail();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String time = format.format(new Date()); // 将当前时间袼式化为指定的格式
+
+ log.info("---->{}", phone);
+ if(StrUtil.isNotBlank(phone)) {
+ Sms106Send.sendWithdrawalCoinMsg(phone, time);
+ }
/**
//短信提醒
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -441,7 +518,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);
@@ -455,7 +532,7 @@
MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity = selectByMap2.get(0);
memberAccountMoneyChangeEntity.setStatus(MemberAccountMoneyChangeEntity.STATUS_FAIL_INTEGER);
- memberAccountMoneyChangeEntity.setAmount(selectById.getAmount().negate());
+ memberAccountMoneyChangeEntity.setAmount(selectById.getAmount());
memberAccountMoneyChangeMapper.updateById(memberAccountMoneyChangeEntity);
selectById.setStatus(MemberCoinWithdrawEntity.IS_STATUS_N);
@@ -518,8 +595,10 @@
String closingpriceByMid = memberMapper.selectClosingpriceForBasicRealData();
//平仓总手续费
String sellClosingpriceByMid = memberMapper.selectSellClosingpriceForBasicRealData();
+
//总盈亏
String rewardratioByMid = memberMapper.selectRewardratioForBasicRealData();
+
//持仓人数
String notNullNumber = memberMapper.selectSFCCForBasicRealData();
//币币账户不为空的人数
--
Gitblit v1.9.1