From c947945f2c3631bd5fb4033f6a34fed6e4345c62 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 11 Apr 2023 15:54:42 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 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 03e3920..e4348c8 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
@@ -34,6 +34,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.lang.reflect.Member;
import java.math.BigDecimal;
import java.util.*;
@@ -106,16 +107,16 @@
throw new FebsException("邀请码不存在");
}
/**
- * 设置成普通会员，则不允许推广
+ * 设置成粉丝，则不允许推广
*/
if(inviteMember.getLevel().equals(MemberLevelEnum.FANS.getType())){
throw new FebsException("邀请码不能推广");
}
//购买套餐产生业绩，才能推广会员
- List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
- if(CollUtil.isEmpty(mallAchieveRecordList)){
- throw new FebsException("邀请码不能推广");
- }
+// List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
+// if(CollUtil.isEmpty(mallAchieveRecordList)){
+// throw new FebsException("邀请码不能推广");
+// }
mallMember.setReferrerId(registerDto.getInviteId());
@@ -249,7 +250,7 @@
if (payment != null) {
mallMemberVo.setHasPayment(1);
}
- mallMemberVo.setLevelName(mallMember.getLevel());
+ mallMemberVo.setLevelName(MemberLevelEnum.NORMAL.getLevelDescription(mallMember.getLevel()));
mallMemberVo.setPartner(mallMember.getPartner());
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
mallMemberVo.setBalance(wallet.getBalance());
@@ -324,6 +325,12 @@
MallMember mallMember = this.baseMapper.selectById(memberId);
List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId());
+ if(CollUtil.isNotEmpty(list)){
+ for(TeamListVo teamListVo : list){
+ String levelDescription = MemberLevelEnum.NORMAL.getLevelDescription(teamListVo.getLevel());
+ teamListVo.setLevelName(levelDescription);
+ }
+ }
MyTeamVo myTeamVo = new MyTeamVo();
myTeamVo.setTeam(list);
@@ -428,16 +435,15 @@
}
@Override
- public BigDecimal canMoney() {
+ public BigDecimal canMoney(int type) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
-
- BigDecimal canMoney = wallet.getCommission();
- if (profit != null) {
- if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
+ BigDecimal canMoney = BigDecimal.ZERO;
+ if(1 == type){
+ canMoney = wallet.getBalance();
+ }
+ if(2 == type){
+ canMoney = wallet.getScore();
}
return canMoney;
}
@@ -478,11 +484,14 @@
}
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(id);
- commissionVo.setCommission(wallet.getCommission());
- commissionVo.setToday(mallMoneyFlowMapper.selectCommissionIncome(1, new Date(), id));
- commissionVo.setMonth(mallMoneyFlowMapper.selectCommissionIncome(2, new Date(), id));
- commissionVo.setTotal(mallMoneyFlowMapper.selectCommissionIncome(null, null, id));
- commissionVo.setWaitCommission(BigDecimal.ZERO);
+ commissionVo.setCommissionBalance(wallet.getBalance());
+ commissionVo.setCommissionScore(wallet.getScore());
+ commissionVo.setTodayBalance(mallMoneyFlowMapper.selectCommissionIncome(1,1, new Date(), id));
+ commissionVo.setMonthBalance(mallMoneyFlowMapper.selectCommissionIncome(1,2, new Date(), id));
+ commissionVo.setTotalBalance(mallMoneyFlowMapper.selectCommissionIncome(1, null,null, id));
+ commissionVo.setTodayScore(mallMoneyFlowMapper.selectCommissionIncome(2, 1,new Date(), id));
+ commissionVo.setMonthScore(mallMoneyFlowMapper.selectCommissionIncome(2, 2,new Date(), id));
+ commissionVo.setTotalScore(mallMoneyFlowMapper.selectCommissionIncome(2, null,null, id));
return commissionVo;
}
--
Gitblit v1.9.1