From a31721c6deee97f54ecb1dcf6d7324433c1f9dbc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 04 Jun 2021 11:31:07 +0800
Subject: [PATCH] 20210604
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 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 8d5a337..a64a272 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
@@ -13,8 +13,10 @@
import com.xcong.excoin.common.configure.FebsConfigure;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.modules.Sms106Send;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
+import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
@@ -34,6 +36,7 @@
import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
import com.xcong.excoin.modules.member.service.IMemberService;
+import com.xcong.excoin.modules.member.vo.MemberActivityReceiveVo;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -488,7 +491,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public FebsResponse memberWithdrawCoinConfirm(@NotNull(message = "{required}") Long id) {
MemberCoinWithdrawEntity selectById = memberCoinWithdrawMapper.selectById(id);
@@ -516,10 +519,19 @@
columnMap.put("address", address);
// 如果是内部转账 则需要将币加到内部地址
List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
- if(selectByMap == null || selectByMap.isEmpty()) {
- return new FebsResponse().message("地址有误，请拒绝！");
+ Long aimMemberId = null;
+ if(CollUtil.isEmpty(selectByMap)) {
+// return new FebsResponse().message("地址有误，请拒绝！");
+// throw new GlobalException("地址有误，请拒绝！");
+ MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
+ if (memberEntity == null) {
+ throw new GlobalException("地址有误或用户不存在，请拒绝！");
+ }
+
+ aimMemberId = memberEntity.getId();
+ } else {
+ aimMemberId = selectByMap.get(0).getMemberId();
}
- Long aimMemberId = selectByMap.get(0).getMemberId();
MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
BigDecimal addTotal = aimWalletCoin.getTotalBalance().add(selectById.getAmount());
@@ -2223,14 +2235,14 @@
@Override
public IPage<MemberDataInfoVo> findAllDataInfoListInPage(MemberEntity memberEntity, QueryRequest request) {
String account = memberEntity.getAccount();
- String isTest = memberEntity.getIsTest();
+// String isTest = memberEntity.getIsTest();
//如果account为空，查询全部，account不为空查询对应的memberEntity
if(StrUtil.isNotEmpty(account)) {
memberEntity = memberMapper.selectMemberByAccount(account);
}else {
memberEntity = memberMapper.selectMemberByAccount(MemberEntity.SYSTEM_REFERER);
}
- memberEntity.setIsTest(isTest);
+// memberEntity.setIsTest("");
Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.findMemberDataInfoOneAllRealInPage(page, memberEntity);
//USDT充币总额+USDT提币总额
@@ -2248,7 +2260,7 @@
String rewardratioByMid = memberMapper.selectRewardratioForAllDataInfo(memberEntity);
//持仓人数
- String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
+// String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
//币币账户不为空的人数
String walletNumber = memberMapper.selectBBZHForAllDataInfo(memberEntity);
//合约账户不为空的人数
@@ -2282,7 +2294,7 @@
memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == "0" ? "0" : df.format(Double.parseDouble(sellClosingpriceByMid)));
memberDataInfoVo.setFee(returnMoneyByMid == "0" ? "0" : df.format(Double.parseDouble(returnMoneyByMid)));
memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : df.format(Double.parseDouble(rewardratioByMid)));
- memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
+// memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0.00 ? "0" : df.format(platformProfitAndLoss));
@@ -2296,4 +2308,21 @@
return selectMemberListInPage;
}
+
+ @Override
+ public IPage<MemberActivityReceiveVo> memberActivityReceive(ActivityReceiveRecord activityReceiveRecord,
+ QueryRequest request) {
+
+ Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return memberMapper.memberActivityReceive(page, activityReceiveRecord);
+ }
+
+
+ @Override
+ public IPage<ActivityReceiveRecord> seeReceiveInfo(QueryRequest request,
+ ActivityReceiveRecord activityReceiveRecord) {
+ Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return memberMapper.seeReceiveInfo(page, activityReceiveRecord);
+ }
+
}
--
Gitblit v1.9.1