From 6844012e52912b53d2739759d7b9f5591ac21f24 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 16 May 2022 19:29:55 +0800
Subject: [PATCH] fix goods edit
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 156 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 149 insertions(+), 7 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 cfc8201..d2a96d2 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
@@ -1,12 +1,19 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.mall.entity.AgentInfo;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberWalletMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.service.IAgentService;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
@@ -14,8 +21,14 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author wzy
@@ -29,8 +42,11 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberMapper memberMapper;
private final MallOrderInfoMapper orderInfoMapper;
+ private final IApiMallMemberWalletService memberWalletService;
+ private final IApiMallMemberService memberService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public void autoUpAgentLevel(Long memberId) {
MallMember member = memberMapper.selectById(memberId);
if(StrUtil.isBlank(member.getReferrerIds())) {
@@ -40,19 +56,24 @@
List<String> ids = StrUtil.split(member.getReferrerIds(), ',');
List<MallMember> parentMembers = memberMapper.selectByInviteIds(ids);
for (MallMember parent : parentMembers) {
+ // 未激活用户无法升级
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+ continue;
+ }
+
DataDictionaryCustom nextLevel = dataDictionaryCustomMapper.selectNextAgentLevelInfo(parent.getLevel());
if (nextLevel == null) {
log.info("当前层级无下一级:{}", parent.getLevel());
- return;
+ continue;
}
AgentInfo agentInfo = JSONObject.parseObject(nextLevel.getValue(), AgentInfo.class);
if (!orderCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
if (!agentCntFinish(parent, agentInfo)) {
- return;
+ continue;
}
parent.setLevel(nextLevel.getCode());
@@ -66,12 +87,17 @@
* @return
*/
private boolean orderCntFinish(MallMember member, AgentInfo agentInfo) {
- Integer cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
+ Integer cnt = 0;
+ if (AgentInfo.ORDER_TYPE_DIRECT.equals(agentInfo.getOrderType())) {
+ cnt = orderInfoMapper.selectCntDirect(member.getInviteId());
+ } else {
+ cnt = orderInfoMapper.selectCntDirectOrTeam(agentInfo.getOrderType(), member.getInviteId());
+ }
if (cnt >= agentInfo.getOrderCnt()) {
return true;
}
- log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getAccount(), cnt, agentInfo.getOrderCnt(), member.getLevel());
+ log.info("用户{}订单未达标, 当前数量为:{},要求数量:{}, 当前等级为:{}", member.getPhone(), cnt, agentInfo.getOrderCnt(), member.getLevel());
return false;
}
@@ -81,7 +107,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
return true;
}
@@ -104,12 +130,128 @@
return true;
}
- log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getAccount(), member.getLevel(), i, agentInfo.getLastCnt());
+ log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastCnt());
return false;
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void returnMoneyToAgent(Long orderId) {
+ MallOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
+
+ MallMember member = memberMapper.selectById(orderInfo.getMemberId());
+ if (StrUtil.isBlank(member.getReferrerIds())) {
+ return;
+ }
+
+ // 直推奖励
+ directReturnMoney(member, orderInfo);
+ // 团队奖励
+ teamReturnMoney(member, orderInfo);
+ }
+
+ /**
+ * 直推奖励
+ * @param member
+ */
+ private void directReturnMoney(MallMember member, MallOrderInfo orderInfo) {
+ MallMember parent = memberMapper.selectInfoByInviteId(member.getReferrerId());
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(parent.getLevel())) {
+ return;
+ }
+
+ BigDecimal returnMoney;
+ if (AgentLevelEnum.FIRST_LEVEL.name().equals(parent.getLevel())) {
+ returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
+ } else {
+ AgentInfo agentInfo = getAgentInfo(parent.getLevel());
+ if (agentInfo == null) {
+ return;
+ }
+
+ returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
+ }
+ memberWalletService.addBalance(returnMoney, parent.getId());
+
+// memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
+ }
+
+ /**
+ * 团队奖励
+ *
+ */
+ public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
+ List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
+ List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
+ if (CollUtil.isEmpty(agentList)) {
+ return;
+ }
+
+ Map<String, Map<Long, BigDecimal>> needReturn = new HashMap<>();
+ for (MallMember mallMember : agentList) {
+ String level = mallMember.getLevel();
+
+ List<MallMember> bigLevel = memberMapper.selectMallMemberByInviteIdAndLevel(mallMember.getInviteId(),level);
+ if(CollUtil.isNotEmpty(bigLevel)){
+ continue;
+ }
+
+ Map<Long, BigDecimal> amount = needReturn.get(level);
+
+ // 按照代理关系，返到第二级，平级奖
+ if (amount == null) {
+ amount = new HashMap<>();
+ AgentInfo agentInfo = getAgentInfo(level);
+ if (agentInfo == null) {
+ continue;
+ }
+
+ BigDecimal returnMoney;
+ if (AgentInfo.TEAM_INCOME_TYPE_AMOUNT.equals(agentInfo.getTeamIncomeType())) {
+ returnMoney = agentInfo.getTeamIncome();
+ } else {
+ returnMoney = agentInfo.getTeamIncome().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN).multiply(orderInfo.getAmount());
+ }
+ amount.put(mallMember.getId(), returnMoney);
+ } else {
+ if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
+ // 代理两级
+ if (amount.size() >= 2) {
+ continue;
+ } else {
+ amount.put(mallMember.getId(), BigDecimal.ONE);
+ }
+ }
+ }
+
+ needReturn.put(level, amount);
+ }
+
+ if(needReturn.isEmpty()) {
+ return;
+ }
+
+ for (Map.Entry<String, Map<Long, BigDecimal>> entry : needReturn.entrySet()) {
+ for (Map.Entry<Long, BigDecimal> amount : entry.getValue().entrySet()) {
+ memberWalletService.addBalance(amount.getValue(), amount.getKey());
+
+// memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
+ }
+ }
+ }
+
+ private AgentInfo getAgentInfo(String level) {
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.AGENT_LEVEL_REQUIRE, level);
+ if (dic == null) {
+ log.info("当前用户父级等级:{}", level);
+ return null;
+ }
+
+ return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
+ }
+
+ @Override
+ public void rankReturnMoney(Long orderId) {
}
}
--
Gitblit v1.9.1