From 0388103f0eb9ec4c7a1b83d12c83da09fe73dfff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Oct 2022 11:47:25 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 72 insertions(+), 23 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 6df59ff..762cdc2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -28,6 +28,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,8 +66,9 @@
private final PlatformBannerMapper platformBannerMapper;
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final DappBankDao dappBankDao;
- private final DappMemberService dappMemberService;
+// private final DappMemberService dappMemberService;
private final DappMemberAddressDao dappMemberAddressDao;
+ private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -206,8 +208,11 @@
public IPage<DappMemberEntity> selectInPage(DappMemberEntity member, QueryRequest request) {
Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
User currentUser = FebsUtil.getCurrentUser();
- if (currentUser.getDeptId() == null) {
- member.setCurrentUser(currentUser.getUserId());
+// if (currentUser.getDeptId() == null) {
+// member.setCurrentUser(currentUser.getUserId());
+// }
+ if(StrUtil.isNotEmpty(currentUser.getDescription())){
+ member.setDescription(currentUser.getDescription());
}
return dappMemberDao.selectInPage(member, page);
}
@@ -418,6 +423,8 @@
member.setPassword(SecureUtil.md5(registerDto.getPassword()));
member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
member.setRefererId(registerDto.getRefererId());
+ member.setIsOnHook(2);
+ member.setIsProfit(1);
dappMemberDao.insert(member);
//更新用户信息
@@ -445,6 +452,7 @@
dappWalletCoinEntity.setAvailableAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setTotalAmount(AppContants.INIT_MONEY);
+ dappWalletCoinEntity.setWalletCode("USDT");
dappWalletCoinDao.insert(dappWalletCoinEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("register_err_006"));
@@ -514,6 +522,8 @@
dappMemberEntity = new DappMemberEntity();
dappMemberEntity.setTouristMark(touristMark);
dappMemberEntity.setIdentity(DataDictionaryEnum.LEVEL_TM.getCode());
+ dappMemberEntity.setIsOnHook(2);
+ dappMemberEntity.setIsProfit(1);
dappMemberDao.insert(dappMemberEntity);
//初始化账户信息
@@ -594,18 +604,39 @@
}else{
memberInfoVo.setIsSetTransferCode(2);
}
+ if(ObjectUtil.isNotEmpty(dappMemberEntity.getRealname())){
+ memberInfoVo.setRealname(dappMemberEntity.getRealname());
+ }
int isOnHook = dappMemberEntity.getIsOnHook() == null ? 2 : dappMemberEntity.getIsOnHook();
memberInfoVo.setIsOnHook(isOnHook);
+
+
+ BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
+ memberInfoVo.setTotalProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
if(ObjectUtil.isEmpty(dappMemberEntity)){
memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
+ memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+ memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
}else{
BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
+ BigDecimal frozenAmount = dappWalletCoinEntity.getFrozenAmount();
+ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
}else{
- memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
+ memberInfoVo.setTotalAmount(totalAmount.setScale(4,BigDecimal.ROUND_DOWN));
+ }
+ if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
+ memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
+ }else{
+ memberInfoVo.setFrozenAmount(frozenAmount.setScale(4,BigDecimal.ROUND_DOWN));
+ }
+ if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
+ memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+ }else{
+ memberInfoVo.setAvailableAmount(availableAmount.setScale(4,BigDecimal.ROUND_DOWN));
}
}
return memberInfoVo;
@@ -734,18 +765,18 @@
if (ObjectUtil.isEmpty(refererMember)) {
return new FebsResponse().fail().message(MessageSourceUtils.getString("register_err_005"));
}
- member = new DappMemberEntity();
- member.setUsername(apiAddTeammateDto.getAccount());
- member.setPassword(SecureUtil.md5(apiAddTeammateDto.getPassword()));
- member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
- member.setRefererId(member.getInviteId());
- dappMemberDao.insert(member);
+ DappMemberEntity memberadd = new DappMemberEntity();
+ memberadd.setUsername(apiAddTeammateDto.getAccount());
+ memberadd.setPassword(SecureUtil.md5(apiAddTeammateDto.getPassword()));
+ memberadd.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
+ memberadd.setRefererId(member.getInviteId());
+ dappMemberDao.insert(memberadd);
//更新用户信息
- String inviteId = ShareCodeUtil.toSerialCode(member.getId());
- member.setInviteId(inviteId);
+ String inviteId = ShareCodeUtil.toSerialCode(memberadd.getId());
+ memberadd.setInviteId(inviteId);
boolean flag = false;
- String parentId = member.getRefererId();
+ String parentId = memberadd.getRefererId();
String ids = "";
while (!flag) {
ids += ("," + parentId);
@@ -758,11 +789,11 @@
flag = true;
}
}
- member.setRefererIds(ids);
- dappMemberDao.updateById(member);
+ memberadd.setRefererIds(ids);
+ dappMemberDao.updateById(memberadd);
//初始化账户信息
DappWalletCoinEntity dappWalletCoinEntity = new DappWalletCoinEntity();
- dappWalletCoinEntity.setMemberId(member.getId());
+ dappWalletCoinEntity.setMemberId(memberadd.getId());
dappWalletCoinEntity.setAvailableAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setTotalAmount(AppContants.INIT_MONEY);
@@ -803,6 +834,7 @@
ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
+ apiAmountTypeVos.add(apiAmountTypeVo);
}
}
return new FebsResponse().success().data(apiAmountTypeVos);
@@ -818,12 +850,10 @@
}
@Override
- public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
+ public FebsResponse getBankListInPage(ApiBankListDto apiBankListDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
- Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
- apiBankListDto.setMemberId(member.getId());
- IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
- return apiBankListVoIPage;
+ List<ApiBankListVo> apiBankListVos = dappBankDao.selectBankListByMemberId(member.getId());
+ return new FebsResponse().success().data(apiBankListVos);
}
@Override
@@ -833,7 +863,7 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = dappMemberService.validateTransferCode(addBankDto.getTransferCode(), member.getId());
+ Boolean aBoolean = validateTransferCodeInside(addBankDto.getTransferCode(), member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -854,6 +884,22 @@
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
+ private Boolean validateTransferCodeInside(String transferCode, Long memberId) {
+ boolean flag = false;
+ DappMemberEntity member = dappMemberDao.selectById(memberId);
+ if (ObjectUtil.isEmpty(member)) {
+ return flag;
+ }
+ String transferCodeMember = member.getTransferCode();
+ String transferCodeMd5Pwd = SecureUtil.md5(transferCode);
+ if(transferCodeMd5Pwd.equals(transferCodeMember)){
+ flag = true;
+ }else{
+ return flag;
+ }
+ return flag;
+ }
+
@Override
public FebsResponse getBankListInPage() {
DappMemberEntity member = LoginUserUtil.getAppUser();
@@ -868,7 +914,7 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = dappMemberService.validateTransferCode(apiAddAddressDto.getTransferCode(), member.getId());
+ Boolean aBoolean = validateTransferCodeInside(apiAddAddressDto.getTransferCode(), member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -878,6 +924,7 @@
}
DappMemberAddress dappMemberAddress = new DappMemberAddress();
dappMemberAddress.setType(apiAddAddressDto.getType());
+ dappMemberAddress.setMemberId(member.getId());
dappMemberAddress.setAddress(apiAddAddressDto.getAddress());
dappMemberAddressDao.insert(dappMemberAddress);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -887,4 +934,6 @@
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+
+
}
--
Gitblit v1.9.1