From d071926dc82b991b762aaefea03c6d21621c415e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Dec 2022 18:18:36 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 4 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 1558eaa..c4fdfb7 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
@@ -31,6 +31,7 @@
import cn.hutool.crypto.asymmetric.RSA;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,6 +70,8 @@
private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
private final AppVersionMapper appVersionMapper;
private final DappMessageDao dappMessageDao;
+ private final MemberCoinChargeDao memberCoinChargeDao;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -703,6 +706,16 @@
String md5Pwd = SecureUtil.md5(AppContants.MEMBER_LOGIN_CODE);
member.setPassword(md5Pwd);
dappMemberDao.updateById(member);
+
+ String redisKey = AppContants.REDIS_KEY_SIGN + member.getId();
+ String existToken = redisUtils.getString(redisKey);
+ if (StrUtil.isNotBlank(existToken)) {
+ Object o = redisUtils.get(existToken);
+ if (ObjectUtil.isNotEmpty(o)) {
+ redisUtils.del(existToken);
+ }
+ }
+ redisUtils.del(redisKey);
}
@Override
@@ -878,7 +891,11 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = validateTransferCodeInside(addBankDto.getTransferCode(), member.getId());
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferCode = addBankDto.getTransferCode();
+ transferCode = rsa.decryptStr(transferCode, KeyType.PrivateKey);
+ Boolean aBoolean = validateTransferCodeInside(transferCode, member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -929,7 +946,11 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = validateTransferCodeInside(apiAddAddressDto.getTransferCode(), member.getId());
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferCode = apiAddAddressDto.getTransferCode();
+ transferCode = rsa.decryptStr(transferCode, KeyType.PrivateKey);
+ Boolean aBoolean = validateTransferCodeInside(transferCode, member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -1016,7 +1037,7 @@
dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(),
- availableAmount,coinNumber,availableAmount.add(coinNumber) ,"充值", 10);
+ availableAmount,coinNumber,availableAmount.add(coinNumber) ,"充值（手动）", 10);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
return new FebsResponse().success().message("操作成功");
}
@@ -1062,7 +1083,7 @@
dappAccountMoneyChangeDao.insert(addFlow);
dappAccountMoneyChangeDao.deleteById(dappAccountMoneyChangeEntity.getId());
- return new FebsResponse().fail().message("操作成功");
+ return new FebsResponse().success().message("操作成功");
}else{
return new FebsResponse().fail().message("只允许回退【盈利分成】和【流水佣金】");
}
@@ -1105,6 +1126,84 @@
return adminMemberCoinWithdrawVos;
}
+ @Override
+ public IPage<AdminTeamInfoVo> getTeamInfo(DappMemberEntity dappMemberEntity, QueryRequest request) {
+ Page<AdminTeamInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ dappMemberEntity = this.baseMapper.selectById(dappMemberEntity.getId());
+ IPage<AdminTeamInfoVo> adminTeamInfoVoIPage = this.baseMapper.findTeamInfoListInPage(page, dappMemberEntity);
+ List<AdminTeamInfoVo> records = adminTeamInfoVoIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(AdminTeamInfoVo adminTeamInfoVo : records){
+ Long memberId = adminTeamInfoVo.getId();
+ //获取团队成员的主要信息
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
+ adminTeamInfoVo.setTotalAmount(dappWalletCoinEntity.getTotalAmount());
+ adminTeamInfoVo.setAvaAmount(dappWalletCoinEntity.getAvailableAmount());
+ adminTeamInfoVo.setFrozenAmount(dappWalletCoinEntity.getFrozenAmount());
+
+ BigDecimal chargeAmount = memberCoinChargeDao.selectTotalAmountByMemberId(memberId);
+ adminTeamInfoVo.setChargeAmount(chargeAmount);
+
+ BigDecimal withDrawAmount = memberCoinWithdrawDao.selectTotalAmountByMemberIdAndType(memberId,"N");
+ adminTeamInfoVo.setWithDrawAmount(withDrawAmount);
+ BigDecimal insideAmount = memberCoinWithdrawDao.selectTotalAmountByMemberIdAndType(memberId,"Y");
+ adminTeamInfoVo.setInsideAmount(insideAmount);
+
+ QueryWrapper<IgtOnHookPlanOrder> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id",memberId);
+ Integer onHookTimes = igtOnHookPlanOrderDao.selectCount(objectQueryWrapper);
+ adminTeamInfoVo.setOnHookTimes(onHookTimes);
+ BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
+ adminTeamInfoVo.setTotalProfit(totalProfit);
+ }
+ }
+ return adminTeamInfoVoIPage;
+ }
+
+ @Override
+ public FebsResponse sendBackMessage(DappMessageEntity dappMessageEntity) {
+ if(ObjectUtil.isEmpty(dappMessageEntity.getBackMessage())){
+ return new FebsResponse().fail().message("回复不能为空。");
+ }
+ Long id = dappMessageEntity.getId();
+ DappMessageEntity dappMessage = dappMessageDao.selectById(id);
+ DappMessageEntity dappMessageEntityBack = new DappMessageEntity();
+ dappMessageEntityBack.setMemberId(dappMessage.getMemberId());
+ dappMessageEntityBack.setBackMessage(dappMessageEntity.getBackMessage());
+ dappMessageDao.insert(dappMessageEntityBack);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public IPage<DappMessageEntity> showMessageList(DappMessageEntity dappMessageEntity, QueryRequest request) {
+ dappMessageEntity = dappMessageDao.selectById(dappMessageEntity.getId());
+ Page<DappMessageEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<DappMessageEntity> dappMessageEntitys = dappMemberDao.showMessageListInPage(page, dappMessageEntity);
+ return dappMessageEntitys;
+ }
+
+ @Override
+ public IPage<ApiMessageListVo> getMessageListInPage(ApiMessageListDto apiMessageListDto) {
+ Page<ApiMessageListVo> page = new Page<>(apiMessageListDto.getPageNum(), apiMessageListDto.getPageSize());
+
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMessageEntity dappMessageEntity = new DappMessageEntity();
+ dappMessageEntity.setMemberId(member.getId());
+ IPage<ApiMessageListVo> records = dappMemberDao.getMessageListInPage(page, dappMessageEntity);
+ return records;
+ }
+
+ @Override
+ public void reloadSystem() {
+ //系统开关设置为ON
+ DataDictionaryCustom onOff = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ON_OFF.getType(), DataDictionaryEnum.ON_OFF.getCode());
+ onOff.setValue("OFFSET!");
+ dataDictionaryCustomMapper.updateById(onOff);
+ dappWalletCoinDao.updateAmountToZero();
+ //将所有的挂机记录结束
+ igtOnHookPlanOrderDao.updatePlanOrder();
+ }
+
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