From 526c6c73ffba70b271ff20732d5f84cd0f410834 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 10 Nov 2022 17:07:34 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 203 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 33 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..3578a7b 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;
@@ -42,10 +43,7 @@
import java.io.IOException;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -65,8 +63,10 @@
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 AppVersionMapper appVersionMapper;
private final RedisTemplate<String, Object> redisTemplate;
@@ -206,8 +206,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 +421,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 +450,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"));
@@ -493,8 +499,8 @@
}
String token = IdUtil.simpleUUID();
- redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity), 3600);
- redisUtils.set(redisKey, token, 3600);
+ redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity));
+ redisUtils.set(redisKey, token);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
authInfo.put("rasToken", generateAsaToken(token));
@@ -514,6 +520,8 @@
dappMemberEntity = new DappMemberEntity();
dappMemberEntity.setTouristMark(touristMark);
dappMemberEntity.setIdentity(DataDictionaryEnum.LEVEL_TM.getCode());
+ dappMemberEntity.setIsOnHook(2);
+ dappMemberEntity.setIsProfit(1);
dappMemberDao.insert(dappMemberEntity);
//初始化账户信息
@@ -522,6 +530,7 @@
dappWalletCoinEntity.setAvailableAmount(AppContants.TOURIST_INIT_MONEY);
dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setTotalAmount(AppContants.TOURIST_INIT_MONEY);
+ dappWalletCoinEntity.setWalletCode("USDT");
dappWalletCoinDao.insert(dappWalletCoinEntity);
}
@@ -586,7 +595,7 @@
}else{
memberInfoVo.setInviteId(dappMemberEntity.getInviteId());
memberInfoVo.setIdentityCode(identity);
- memberInfoVo.setIdentity("会员");
+ memberInfoVo.setIdentity("Member");
memberInfoVo.setUsername(dappMemberEntity.getUsername());
}
if(ObjectUtil.isNotEmpty(dappMemberEntity.getTransferCode())){
@@ -594,8 +603,15 @@
}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)){
@@ -609,17 +625,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 +764,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,14 +788,15 @@
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);
+ dappWalletCoinEntity.setWalletCode("USDT");
dappWalletCoinDao.insert(dappWalletCoinEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("register_err_006"));
@@ -801,7 +818,7 @@
if(DataDictionaryEnum.LEVEL_TM.getCode().equals(identity)){
apiMyTeammateInfoListVo.setLevelName("游客");
}else{
- apiMyTeammateInfoListVo.setLevelName("会员");
+ apiMyTeammateInfoListVo.setLevelName("Member");
}
}
}
@@ -817,6 +834,7 @@
ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
+ apiAmountTypeVos.add(apiAmountTypeVo);
}
}
return new FebsResponse().success().data(apiAmountTypeVos);
@@ -832,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
@@ -847,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"));
}
@@ -868,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();
@@ -882,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"));
}
@@ -892,13 +924,118 @@
}
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"));
+ }
+
+
+ @Override
+ public List<AppVersion> findAppVersion() {
+ return appVersionMapper.selectList(null);
+ }
+
+ @Override
+ public AppVersion getAppVersionInfoById(long id) {
+ return appVersionMapper.selectById(id);
+ }
+
+ @Override
+ public IPage<AppVersion> getAppVersionList(AppVersion appVersion, QueryRequest request) {
+ Page<AppVersion> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AppVersion> appVersions = this.baseMapper.getAppVersionListInPage(page, appVersion);
+ return appVersions;
+ }
+
+ @Override
+ public FebsResponse delCategary(Long id) {
+ AppVersion appVersion = appVersionMapper.selectById(id);
+ if(ObjectUtil.isEmpty(appVersion)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ appVersionMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse addAppVersion(AppVersion appVersion) {
+ appVersion.setCreatetime(new Date());
+ appVersionMapper.insert(appVersion);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse updateAppVersion(AppVersion appVersion) {
+ AppVersion appVersionBefore = appVersionMapper.selectById(appVersion.getId());
+ if(ObjectUtil.isEmpty(appVersionBefore)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ appVersion.setCreatetime(new Date());
+ appVersionMapper.updateById(appVersion);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<MemberCoinChargeEntity> getChargeListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.getChargeListInPage(page, memberCoinChargeEntity);
+ return memberCoinChargeEntityIPage;
+ }
+
+ @Override
+ public FebsResponse payUsdt(DappMemberEntity memberEntity) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ BigDecimal coinNumber = memberEntity.getCoinNumber() == null ? BigDecimal.ZERO : memberEntity.getCoinNumber();
+ if(BigDecimal.ZERO.compareTo(coinNumber) >= 0){
+ return new FebsResponse().fail().message("请输入正确的金额");
+ }
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappWalletCoinEntity)){
+ return new FebsResponse().fail().message("会员账户不存在");
+ }
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);
+
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(), coinNumber, "充值", 10);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public List<AdminMemberIdentityVo> identitySetList() {
+ ArrayList<AdminMemberIdentityVo> objects = new ArrayList<>();
+ List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.LEVEL_AIB.getType());
+ if(CollUtil.isNotEmpty(dataDictionaryCustoms)){
+ for(DataDictionaryCustom dic :dataDictionaryCustoms){
+ if(!DataDictionaryEnum.LEVEL_TM.getCode().equals(dic.getCode())){
+ AdminMemberIdentityVo adminMemberIdentityVo = new AdminMemberIdentityVo();
+ adminMemberIdentityVo.setIdentityCode(dic.getCode());
+ adminMemberIdentityVo.setIdentityValue(dic.getDescription());
+ objects.add(adminMemberIdentityVo);
+ }
+ }
+ }
+ return objects;
+ }
+
+ @Override
+ public FebsResponse identitySet(DappMemberEntity memberEntity) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ dappMemberEntity.setIdentity(memberEntity.getIdentity());
+ dappMemberDao.updateById(dappMemberEntity);
+ return new FebsResponse().success();
}
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+
+
}
--
Gitblit v1.9.1