From e7ca8ba2b3c3b446e39d4c3a3ea5e238adb2fc7c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 19:07:34 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 62 +++++++++++++++++++-----------
1 files changed, 39 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 89677d0..b143045 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
@@ -65,7 +65,7 @@
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 RedisTemplate<String, Object> redisTemplate;
@@ -609,17 +609,17 @@
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(2,BigDecimal.ROUND_DOWN));
+ memberInfoVo.setFrozenAmount(frozenAmount.setScale(4,BigDecimal.ROUND_DOWN));
}
if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
}else{
- memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
+ memberInfoVo.setAvailableAmount(availableAmount.setScale(4,BigDecimal.ROUND_DOWN));
}
}
return memberInfoVo;
@@ -748,18 +748,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);
@@ -772,11 +772,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);
@@ -817,6 +817,7 @@
ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
+ apiAmountTypeVos.add(apiAmountTypeVo);
}
}
return new FebsResponse().success().data(apiAmountTypeVos);
@@ -832,12 +833,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
@@ -847,7 +846,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"));
}
@@ -868,6 +867,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();
@@ -882,7 +897,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"));
}
@@ -892,6 +907,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"));
--
Gitblit v1.9.1