From d4c0bf0a7cf69d58f87b07031aa6ba1ecfaa012b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 May 2024 10:41:34 +0800
Subject: [PATCH] 增加支付宝收款码
---
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 2 --
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 1 -
src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java | 1 -
4 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index 3b90637..974625d 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -35,8 +35,6 @@
private final ICommonService commonService;
- private final IMemberProfitService memberProfitService;
-
private final AgentProducer agentProducer;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java b/src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java
index c3b5003..f2a0e4d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IMemberProfitService.java
@@ -65,5 +65,4 @@
void fcmOrderBuyCancelMsg(Long buyRecordId);
- void createPerk(MallMember mallMember, BigDecimal basicPerkDirect);
}
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 4a0720d..d549a54 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
@@ -60,7 +60,6 @@
private final MallProductNftMapper mallProductNftMapper;
private final AgentProducer agentProducer;
private final MallMemberAmountMapper mallMemberAmountMapper;
- private final IMemberProfitService iMemberProfitService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1054,6 +1053,56 @@
}
}
+ public void createPerk(MallMember mallMember,BigDecimal basicPerkDirect){
+ /**
+ * 如果用户是冻结，则直接销毁
+ */
+ Integer isFrozen = mallMember.getIsFrozen();
+ if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
+ return;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
+ mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("FNFTW");
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ basicPerkDirect.negate(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+
+ }else {
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
+ return;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountMine);
+
+ MallMemberAmount mallMemberAmountNft = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberAmountNft.setTrendsNft(mallMemberAmountNft.getTrendsNft().add(basicPerkDirect));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountNft);
+
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("NFT");
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ basicPerkDirect,
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getDescrition(),
+ AppContants.MEMBER_FLOW_DONE);
+ }
+ }
+
@Override
public void BuyToSellV2() {
List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndMateState(
@@ -1182,10 +1231,10 @@
/**
* 如果用户是冻结，则直接销毁
*/
- iMemberProfitService.createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
if(StrUtil.isNotEmpty(directMember.getReferrerId())){
MallMember directMemberDirect = memberMapper.selectInfoByInviteId(directMember.getReferrerId());
- iMemberProfitService.createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
}
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
index 75947d6..b49f825 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -1310,7 +1310,6 @@
}
- @Override
public void createPerk(MallMember mallMember,BigDecimal basicPerkDirect){
/**
* 如果用户是冻结，则直接销毁
--
Gitblit v1.9.1