From 3baddff99987a5a98b5d55504853f4995018533b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 18 Mar 2024 16:03:02 +0800
Subject: [PATCH] 抽奖
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 99f8e2d..e9db01c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -899,7 +899,7 @@
continue;
}
BigDecimal nftTotal = mallProductBuy.getNftTotal();
- BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01)));
+ BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01))).setScale(2,BigDecimal.ROUND_DOWN);
if(totalPerk.compareTo(profit) <= 0){
profit = totalPerk;
@@ -924,6 +924,10 @@
MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);
+
+ MallMemberAmount mallMemberAmountPerk = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
+ mallMemberAmountPerk.setTotalPerk(mallMemberAmountPerk.getTotalPerk().subtract(profit));
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountPerk);
BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
@@ -1201,7 +1205,7 @@
queryMallMoneyFlow.eq("is_return",AppContants.MEMBER_FLOW_ING);
queryMallMoneyFlow.eq("flow_type",FlowTypeNewEnum.NFT.getValue());
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(queryMallMoneyFlow);
- if(CollUtil.isNotEmpty(mallMoneyFlows)){
+ if(CollUtil.isEmpty(mallMoneyFlows)){
return;
}
@@ -1224,7 +1228,7 @@
Long memberId = mallMoneyFlow.getMemberId();
MallMember mallMember = memberMapper.selectById(memberId);
Integer isFrozen = mallMember.getIsFrozen();
- if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
+ if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
@@ -1241,6 +1245,13 @@
AppContants.MEMBER_FLOW_ING);
}else {
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(memberId);
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount())) >= 0){
+ continue;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount()));
+ mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
+
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(mallMoneyFlow.getAmount()));
@@ -1250,7 +1261,7 @@
String orderNo = MallUtils.getOrderNum("NFT");
mallMoneyFlowService.addMoneyFlow(
memberId,
- mallMoneyFlow.getAmount().negate(),
+ mallMoneyFlow.getAmount(),
MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getValue(),
orderNo,
null,
@@ -1268,7 +1279,7 @@
queryMallMoneyFlow.eq("is_return",AppContants.MEMBER_FLOW_ING);
queryMallMoneyFlow.eq("flow_type",FlowTypeNewEnum.NFT.getValue());
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(queryMallMoneyFlow);
- if(CollUtil.isNotEmpty(mallMoneyFlows)){
+ if(CollUtil.isEmpty(mallMoneyFlows)){
return;
}
@@ -1291,7 +1302,7 @@
Long memberId = mallMoneyFlow.getMemberId();
MallMember mallMember = memberMapper.selectById(memberId);
Integer isFrozen = mallMember.getIsFrozen();
- if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
+ if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
@@ -1308,6 +1319,13 @@
AppContants.MEMBER_FLOW_ING);
}else {
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(memberId);
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount())) >= 0){
+ continue;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount()));
+ mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
+
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(mallMoneyFlow.getAmount()));
@@ -1317,7 +1335,7 @@
String orderNo = MallUtils.getOrderNum("NFT");
mallMoneyFlowService.addMoneyFlow(
memberId,
- mallMoneyFlow.getAmount().negate(),
+ mallMoneyFlow.getAmount(),
MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT_DONE.getValue(),
orderNo,
null,
@@ -1335,7 +1353,7 @@
queryMallMoneyFlow.eq("is_return",AppContants.MEMBER_FLOW_ING);
queryMallMoneyFlow.eq("flow_type",FlowTypeNewEnum.NFT.getValue());
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowMapper.selectList(queryMallMoneyFlow);
- if(CollUtil.isNotEmpty(mallMoneyFlows)){
+ if(CollUtil.isEmpty(mallMoneyFlows)){
return;
}
@@ -1358,7 +1376,7 @@
Long memberId = mallMoneyFlow.getMemberId();
MallMember mallMember = memberMapper.selectById(memberId);
Integer isFrozen = mallMember.getIsFrozen();
- if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
+ if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmount);
@@ -1375,6 +1393,14 @@
AppContants.MEMBER_FLOW_ING);
}else {
+
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(memberId);
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount())) >= 0){
+ continue;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(mallMoneyFlow.getAmount()));
+ mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
+
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmount.setFrozenNft(mallMemberAmount.getFrozenNft().subtract(mallMoneyFlow.getAmount()));
mallMemberAmount.setTrendsNft(mallMemberAmount.getTrendsNft().add(mallMoneyFlow.getAmount()));
@@ -1384,7 +1410,7 @@
String orderNo = MallUtils.getOrderNum("NFT");
mallMoneyFlowService.addMoneyFlow(
memberId,
- mallMoneyFlow.getAmount().negate(),
+ mallMoneyFlow.getAmount(),
MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS_DONE.getValue(),
orderNo,
null,
--
Gitblit v1.9.1