From 12da934232fa2787ef334d66211b6f49b6895b27 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Sep 2023 17:04:22 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 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 15990b7..aac380e 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
@@ -72,6 +72,7 @@
private final MallGoodsCategoryMapper mallGoodsCategoryMapper;
private final PlatformBannerMapper platformBannerMapper;
private final MallGoodsImagesMapper goodsImagesMapper;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -164,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);
@@ -217,7 +223,8 @@
for(DappMemberEntity memberEntity : records){
Long memberId = memberEntity.getId();
- List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
+// List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(memberId);
+ List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(memberId);
BigDecimal myShareAchieve = BigDecimal.ZERO;
if(CollUtil.isNotEmpty(mallAchieveRecords)){
Date payTime = mallAchieveRecords.get(0).getPayTime();
@@ -225,6 +232,13 @@
myShareAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(payTime);
}
memberEntity.setMyShareAchieve(myShareAchieve);
+
+
+ BigDecimal totalIncomeMember = dappMemberDao.selectAllAchieveByRefId(memberEntity.getInviteId());
+ memberEntity.setMyTeamAchieve(totalIncomeMember);
+
+ BigDecimal withdrawAmount = memberCoinWithdrawDao.selectByMemberIdAndStatus(memberId, MemberCoinWithdrawEntity.STATUS_YES);
+ memberEntity.setWithdrawAmount(withdrawAmount);
}
}
return dappMemberEntityIPage;
@@ -537,7 +551,8 @@
dappMemberInfoVo.setPayCnt(payCnt);
dappMemberInfoVo.setCancelCnt(cancelCnt);
- List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(member.getId());
+// List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberId(member.getId());
+ List<MallAchieveRecord> mallAchieveRecords = mallAchieveRecordMapper.selectListByMemberIdAndScore(member.getId());
BigDecimal myShareAchieve = BigDecimal.ZERO;
if(CollUtil.isNotEmpty(mallAchieveRecords)){
Date payTime = mallAchieveRecords.get(0).getPayTime();
@@ -645,11 +660,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("商品不存在");
@@ -766,7 +787,7 @@
}
BigDecimal totalAmount = orderInfo.getAmount();
if(achieveAva.compareTo(totalAmount) < 0){
- throw new FebsException("用户最多购买"+achieveAva.setScale(2,BigDecimal.ROUND_DOWN)+"USDT");
+ throw new FebsException("用户最多购买"+achieveAva.setScale(2,BigDecimal.ROUND_DOWN));
}
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(member.getId());
@@ -839,10 +860,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("正在进行中，请稍后再试");
@@ -1291,7 +1317,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(1);
+ 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(2);
+ 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