From 08181609f58ed88764960fcf2cfd37dd246fc297 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 14 Sep 2023 11:08:14 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 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 03eb2c8..4eb3c1d 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
@@ -165,6 +165,11 @@
member = insertMember(connectDto.getAddress(), referenceID,nodeType);
}
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ if(2 == dappMemberEntity.getChangeAble()){
+ throw new FebsException("账号已冻结");
+ }
+
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
redisUtils.hset(AppContants.REDIS_KEY_MEMBER_INFO, connectDto.getAddress(), member);
@@ -229,7 +234,7 @@
memberEntity.setMyShareAchieve(myShareAchieve);
- BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByInviteId(memberEntity.getInviteId());
+ BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByRefId(memberEntity.getInviteId());
memberEntity.setMyTeamAchieve(totalIncomeMember);
BigDecimal withdrawAmount = memberCoinWithdrawDao.selectByMemberIdAndStatus(memberId, MemberCoinWithdrawEntity.STATUS_YES);
@@ -595,7 +600,12 @@
@Override
public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
- return dataDictionaryCustomMapper.getAgentLevelOption();
+ List<AdminAgentLevelOptionTreeVo> agentLevelOption = dataDictionaryCustomMapper.getAgentLevelOption();
+ AdminAgentLevelOptionTreeVo adminAgentLevelOptionTreeVo = new AdminAgentLevelOptionTreeVo();
+ adminAgentLevelOptionTreeVo.setId("MEMBER");
+ adminAgentLevelOptionTreeVo.setName("MEMBER");
+ agentLevelOption.add(adminAgentLevelOptionTreeVo);
+ return agentLevelOption;
}
@Override
@@ -655,11 +665,17 @@
@Transactional
public Long createOrder(AddOrderDto addOrderDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ if(2 == dappMemberEntity.getChangeAble()){
+ throw new FebsException("账号已冻结");
+ }
// DappMemberEntity member = dappMemberDao.selectById(1L);
/**
* 1、商品是否上架
* 2、用户余额是否足够
*/
+
MallGoods mallGoods = mallGoodsMapper.selectById(addOrderDto.getGoodsId());
if(ObjectUtil.isEmpty(mallGoods)){
throw new FebsException("商品不存在");
@@ -849,10 +865,15 @@
public FebsResponse salePackage(SalePackageDto salePackageDto) {
Long memberId = LoginUserUtil.getAppUser().getId();
BigDecimal cnt = salePackageDto.getCnt();
+
if(ObjectUtil.isEmpty(salePackageDto.getCnt())){
throw new FebsException("请输入正确的数量");
}
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+
+ if(2 == dappMemberEntity.getChangeAble()){
+ throw new FebsException("账号已冻结");
+ }
BigDecimal saleDoing = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId, FundFlowEnum.SALE_PACKAGE.getCode(), DappFundFlowEntity.WITHDRAW_STATUS_ING);
if(BigDecimal.ZERO.compareTo(saleDoing) < 0){
throw new FebsException("正在进行中，请稍后再试");
@@ -1301,7 +1322,36 @@
@Override
public List<AKLineLimitVo> packageKline() {
- return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
+// return dappAKlineMapper.selectListByTypeAndLimit(2, 30);
+ List<AKLineLimitVo> akLineLimitVos = dappAKlineMapper.selectListByTypeAndLimitDesc(1, 60);
+ List<AKLineLimitVo> sortedList = akLineLimitVos.stream()
+ .sorted((k1, k2) -> k1.getCreateTime().compareTo(k2.getCreateTime()))
+ .collect(Collectors.toList());
+ return sortedList;
+ }
+
+ @Override
+ public FebsResponse changeAbleYes(Long id) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+ if(ObjectUtil.isEmpty(dappMemberEntity)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ dappMemberEntity.setChangeAble(2);
+ dappMemberDao.updateById(dappMemberEntity);
+ return new FebsResponse().success();
+ }
+ @Override
+ public FebsResponse changeAbleNo(Long id) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(id);
+ if(ObjectUtil.isEmpty(dappMemberEntity)) {
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ dappMemberEntity.setChangeAble(1);
+ dappMemberDao.updateById(dappMemberEntity);
+
+ redisUtils.hdel(AppContants.REDIS_KEY_SIGN, dappMemberEntity.getAddress());
+ redisUtils.hdel(AppContants.REDIS_KEY_MEMBER_INFO, dappMemberEntity.getAddress());
+ return new FebsResponse().success();
}
public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
--
Gitblit v1.9.1