From 7992cd7adb57f8f2cb4b4fa295afb8894c24d0bf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 18 May 2022 17:19:34 +0800
Subject: [PATCH] add export for deliver
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 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 1aa0798..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
@@ -56,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());
@@ -82,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;
}
@@ -97,7 +107,7 @@
* @return
*/
private boolean agentCntFinish(MallMember member, AgentInfo agentInfo) {
- if (agentInfo.getLastCnt() == null) {
+ if (agentInfo.getLastCnt() == null || agentInfo.getLastCnt() == 0) {
return true;
}
@@ -120,7 +130,7 @@
return true;
}
- log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getAccount(), member.getLevel(), i, agentInfo.getLastCnt());
+ log.info("用户:{}代理数量未达标, 当前等级:{}, 当前数量:{}, 目标数量:{}", member.getPhone(), member.getLevel(), i, agentInfo.getLastCnt());
return false;
}
@@ -146,19 +156,24 @@
*/
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())) {
- return;
- }
+ returnMoney = BigDecimal.valueOf(0.3).multiply(orderInfo.getAmount());
+ } else {
+ AgentInfo agentInfo = getAgentInfo(parent.getLevel());
+ if (agentInfo == null) {
+ return;
+ }
- AgentInfo agentInfo = getAgentInfo(parent.getLevel());
- if (agentInfo == null) {
- return;
+ returnMoney = agentInfo.getDirectIncome().divide(BigDecimal.valueOf(100), 2,RoundingMode.DOWN).multiply(orderInfo.getAmount());
}
-
- BigDecimal 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);
+// memberService.addMoneyFlow(parent.getId(), returnMoney, MoneyFlowTypeEnum.BONUS.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
}
/**
@@ -167,7 +182,7 @@
*/
public void teamReturnMoney(MallMember member, MallOrderInfo orderInfo) {
List<String> inviteIds = StrUtil.split(member.getReferrerIds(), ',');
- List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds);
+ List<MallMember> agentList = memberMapper.selectMemberParentAgentList(inviteIds, member.getReferrerId());
if (CollUtil.isEmpty(agentList)) {
return;
}
@@ -175,6 +190,11 @@
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);
@@ -195,13 +215,13 @@
amount.put(mallMember.getId(), returnMoney);
} else {
if (!AgentLevelEnum.SECOND_LEVEL.name().equals(mallMember.getLevel())) {
- amount.put(mallMember.getId(), BigDecimal.ONE);
+ // 代理两级
+ if (amount.size() >= 2) {
+ continue;
+ } else {
+ amount.put(mallMember.getId(), BigDecimal.ONE);
+ }
}
- }
-
- // 代理两级
- if (amount.size() > 2) {
- continue;
}
needReturn.put(level, amount);
@@ -215,7 +235,7 @@
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);
+// memberService.addMoneyFlow(amount.getKey(), amount.getValue(), MoneyFlowTypeEnum.ACHIEVE.getValue(), orderInfo.getOrderNo(), null, null, orderInfo.getMemberId(), null);
}
}
}
@@ -229,4 +249,9 @@
return JSONObject.parseObject(dic.getValue(), AgentInfo.class);
}
+
+ @Override
+ public void rankReturnMoney(Long orderId) {
+
+ }
}
--
Gitblit v1.9.1