From 0478dd656cb551b6d94d1b124fcd2ee7987807c5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 19 Mar 2024 10:09:06 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 8efbeee..88126a3 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -83,7 +83,8 @@
if (mallMember != null) {
throw new FebsException("账号已使用，请重新注册。");
}
- String userKey = registerDto.getUserKey();
+ Integer selectCount = this.baseMapper.selectCount(null);
+ String userKey = ShareCodeUtil.toSerialNumberCode(selectCount);
MallMember mallMemberKey = this.baseMapper.selectByUserKey(userKey);
if (mallMemberKey != null) {
throw new FebsException("账号已使用，请重新注册。");
@@ -298,6 +299,7 @@
mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
+ mallMemberVo.setTotalPerk(mallMemberAmount.getTotalPerk());
DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.YU_YUE_START_TIME.getType(),
DataDictionaryEnum.YU_YUE_START_TIME.getCode()
@@ -311,6 +313,15 @@
Integer pickCount = mallProductBuyMapper.selectListByMemberIdAndState(id);
mallMemberVo.setPickCount(pickCount);
+
+// BigDecimal totalPerk = mallProductBuyMapper.selectTotalPerkByMemberId(mallMember.getId());
+// mallMemberVo.setTotalPerk(totalPerk);
+
+ DataDictionaryCustom insideNFTPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getType(),
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getCode()
+ );
+ mallMemberVo.setInsideNFTPercent(insideNFTPercentDic.getValue());
return new FebsResponse().success().data(mallMemberVo);
}
@@ -379,8 +390,10 @@
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
- myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
+ BigDecimal myAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieve(myAchieve);
+ BigDecimal myTeamAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieve(myTeamAchieve.add(myAchieve));
myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
return new FebsResponse().success().data(myTeamVo);
}
@@ -401,10 +414,14 @@
myTeamVo.setAccountLogin(mallMember.getAccountLogin());
myTeamVo.setIsFrozen(mallMember.getIsFrozen());
myTeamVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMember.getLevel()));
- myTeamVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1));
- myTeamVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2));
- myTeamVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2));
+ BigDecimal myAchieveBuy = this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieveBuy(myAchieveBuy);
+ BigDecimal myAchieveSell = this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 1);
+ myTeamVo.setMyAchieveSell(myAchieveSell);
+ BigDecimal myTeamAchieveBuy = this.baseMapper.selectAchieveBuyByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieveBuy(myTeamAchieveBuy.add(myAchieveBuy));
+ BigDecimal myTeamAchieveSell = this.baseMapper.selectAchieveSellByMemberId(mallMember.getInviteId(), 2);
+ myTeamVo.setMyTeamAchieveSell(myTeamAchieveSell.add(myAchieveSell));
myTeamVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
Integer buyCnt = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMember.getInviteId());
Integer sellCnt = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMember.getInviteId());
@@ -418,11 +435,18 @@
myTeamDirectVo.setMemberId(mallMembersDirect.getId());
myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin());
myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen());
- myTeamDirectVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMembersDirect.getLevel()));
- myTeamDirectVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1));
- myTeamDirectVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1));
- myTeamDirectVo.setMyTeamAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2));
- myTeamDirectVo.setMyTeamAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2));
+ myTeamDirectVo.setLevelName(
+ dataDictionaryCustomMapper.selectDicDataByTypeAndCode(mallMembersDirect.getLevel(),mallMembersDirect.getLevel()).getDescription()
+ );
+
+ BigDecimal myAchieveBuyDirect = this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1);
+ myTeamDirectVo.setMyAchieveBuy(myAchieveBuyDirect);
+ BigDecimal myAchieveSellDirect = this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1);
+ myTeamDirectVo.setMyAchieveSell(myAchieveSellDirect);
+ BigDecimal myTeamAchieveBuyDirect = this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 2);
+ myTeamDirectVo.setMyTeamAchieveBuy(myTeamAchieveBuyDirect.add(myAchieveBuyDirect));
+ BigDecimal myTeamAchieveSellDirect = this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 2);
+ myTeamDirectVo.setMyTeamAchieveSell(myTeamAchieveSellDirect.add(myAchieveSellDirect));
myTeamDirectVo.setMyTeamMemberCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMembersDirect.getInviteId()).size());
Integer buyCntDirect = this.baseMapper.selectAchieveBuyOrderCntByMemberId(mallMembersDirect.getInviteId());
Integer sellCntDirect = this.baseMapper.selectAchieveSellOrderCntByMemberId(mallMembersDirect.getInviteId());
@@ -476,7 +500,7 @@
BigDecimal amount = transferDto.getAmount();
int type = transferDto.getType();
- if(1 != type && 2 != type){
+ if(1 != type && 2 != type && 3 != type){
throw new FebsException("请选择互转类型");
}
Integer insideWith = loginMember.getInsideWith() == null ? 2 :loginMember.getInsideWith();
@@ -501,7 +525,6 @@
throw new FebsException("交易密码错误");
}
- BigDecimal avaAmount = transferDto.getAmount().setScale(2, BigDecimal.ROUND_DOWN);
MallMemberAmount mallMemberAmountLogin = mallMemberAmountMapper.selectByMemberId(loginMember.getId());
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
if(1 == type){
@@ -555,6 +578,47 @@
loginMember.getId(),
FlowTypeNewEnum.TOKEN.getValue(),
MoneyFlowTypeNewEnum.TOKEN_INSIDE_IN.getDescrition());
+ }
+ if(3 == type){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getType(),
+ DataDictionaryEnum.FCM_INSIDE_NFT_PERCENT.getCode()
+ );
+ BigDecimal feePercent = new BigDecimal("0.01").multiply(new BigDecimal(dataDictionaryCustom.getValue()));
+ if (amount.compareTo(mallMemberAmountLogin.getTrendsNft()) > 0) {
+ throw new FebsException("卡牌不足");
+ }
+ BigDecimal fee = amount.multiply(feePercent).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal amountReal = amount.subtract(fee);
+ mallMemberAmountLogin.setTrendsNft(mallMemberAmountLogin.getTrendsNft().subtract(amount));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountLogin);
+ String orderNo = MallUtils.getOrderNum("NFT");
+ mallMoneyFlowService.addMoneyFlow(
+ loginMember.getId(),
+ amountReal.negate(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT.getDescrition());
+ mallMoneyFlowService.addMoneyFlow(
+ loginMember.getId(),
+ fee.negate(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT_FEE.getValue(),
+ orderNo,
+ mallMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_OUT_FEE.getDescrition());
+ mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(amountReal));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmount);
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ amountReal,
+ MoneyFlowTypeNewEnum.NFT_TRANS_IN.getValue(),
+ orderNo,
+ loginMember.getId(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.NFT_TRANS_IN.getDescrition());
}
}
@@ -848,10 +912,10 @@
MallMemberPayment mallMemberPayment = mallMemberPaymentMapper.selectByMemberId(memberId);
mallMemberPayment.setWxQrcode(updatePaymentDto.getWxQrcode());
- mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
+// mallMemberPayment.setAliQrcode(updatePaymentDto.getAliQrcode());
mallMemberPayment.setBankName(updatePaymentDto.getBankName());
- mallMemberPayment.setBankNo(updatePaymentDto.getBankNo());
- mallMemberPayment.setBank(updatePaymentDto.getBank());
+// mallMemberPayment.setBankNo(updatePaymentDto.getBankNo());
+// mallMemberPayment.setBank(updatePaymentDto.getBank());
mallMemberPayment.setPhone(updatePaymentDto.getPhone());
mallMemberPayment.setUsdtTongdao(updatePaymentDto.getUsdtTongdao());
mallMemberPayment.setUsdtAddress(updatePaymentDto.getUsdtAddress());
@@ -884,9 +948,9 @@
);
BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
- BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
+ BigDecimal fcmCntAva = mallMemberAmount.getTokenAva();
if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
- throw new FebsException("解除冻结需要GFA的数量为：" + fcmCntAva);
+ throw new FebsException("激活需要宝石的数量为：" + fcmCntAva);
}
if(2 == unfreezeDto.getType()){
List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
@@ -896,7 +960,7 @@
}
}
BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
- mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
+ mallMemberAmount.setTokenAva(fcmCntAvaSub);
mallMemberAmountMapper.updateById(mallMemberAmount);
mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
this.baseMapper.updateById(mallMember);
@@ -907,7 +971,7 @@
MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
MallUtils.getOrderNum(),
memberId,
- FlowTypeNewEnum.FCM_COIN.getValue(),
+ FlowTypeNewEnum.TOKEN.getValue(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getDescrition());
return new FebsResponse().success().message("操作成功");
--
Gitblit v1.9.1