From 74cae02c58eb057e6f9422038d5b3ed30b7c9a2f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 11 May 2024 10:40:07 +0800
Subject: [PATCH] 香港新环境
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 c935d4d..69926b9 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
@@ -5,20 +5,21 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
-import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
-import cc.mrbird.febs.dapp.contract.andao.AndaoContractMain;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
-import cc.mrbird.febs.dapp.enumerate.*;
+import cc.mrbird.febs.dapp.enumerate.AccountFlowEnum;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
+import cc.mrbird.febs.dapp.enumerate.MemberLevelEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.soccer.entity.SoccerLeagues;
import cc.mrbird.febs.dapp.vo.*;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cc.mrbird.febs.system.entity.User;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -29,13 +30,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.jsoup.helper.DataUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.web3j.utils.Strings;
import java.math.BigDecimal;
-import java.math.BigInteger;
import java.util.*;
import java.util.stream.Collectors;
@@ -600,7 +598,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
@@ -828,8 +831,8 @@
/**
* todo 发送一条订单出的消息
*/
- chainProducer.sendSpeedPayOrderMsg(id);
- chainProducer.sendAutoLevelUpTeamMsg(member.getId());
+// chainProducer.sendSpeedPayOrderMsg(id);
+// chainProducer.sendAutoLevelUpTeamMsg(member.getId());
}
@Override
@@ -860,10 +863,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("正在进行中，请稍后再试");
@@ -888,7 +896,7 @@
dappMemberEntity.setBalance(subtract);
dappMemberDao.updateById(dappMemberEntity);
- chainProducer.sendSalePackageMsg(scoreFlow.getId());
+// chainProducer.sendSalePackageMsg(scoreFlow.getId());
return new FebsResponse().success();
}
@@ -1326,7 +1334,7 @@
if(ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- dappMemberEntity.setChangeAble(1);
+ dappMemberEntity.setChangeAble(2);
dappMemberDao.updateById(dappMemberEntity);
return new FebsResponse().success();
}
@@ -1336,7 +1344,7 @@
if(ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message("会员信息不存在");
}
- dappMemberEntity.setChangeAble(2);
+ dappMemberEntity.setChangeAble(1);
dappMemberDao.updateById(dappMemberEntity);
redisUtils.hdel(AppContants.REDIS_KEY_SIGN, dappMemberEntity.getAddress());
@@ -1344,6 +1352,13 @@
return new FebsResponse().success();
}
+ @Override
+ public IPage<SoccerLeagues> selectSoccerLeaguesInPage(SoccerLeagues soccerLeagues, QueryRequest request) {
+ Page<SoccerLeagues> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<SoccerLeagues> soccerLeaguesIPage = dappMemberDao.selectSoccerLeaguesInPage(soccerLeagues, page);
+ return soccerLeaguesIPage;
+ }
+
public static List<List<String>> partitionList(List<String> originalList, int partitionSize) {
List<List<String>> partitionedList = new ArrayList<>();
int size = originalList.size();
--
Gitblit v1.9.1