From 06f8705b2bbd38aca2cb01e23bc28c5db26d7a7a Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 22:41:27 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 10 ++++++++++
src/main/resources/templates/febs/views/modules/system/bonusSetting.html | 9 ++++++++-
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 79aa9b0..764aa34 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -93,6 +93,7 @@
AGENT_BONUS_RELEASE("MEIYE_BONUS_TYPE", "AGENT_BONUS_RELEASE"),
RECOMMEND_BONUS("MEIYE_BONUS_TYPE", "RECOMMEND_BONUS"),
UNAGENT_TO_AGENT_PARENT("MEIYE_BONUS_TYPE", "UNAGENT_TO_AGENT_PARENT"),
+ UNAGENT_TO_AGENT_PARENT_TWO("MEIYE_BONUS_TYPE", "UNAGENT_TO_AGENT_PARENT_TWO"),
UNAGENT_TO_AGENT("MEIYE_BONUS_TYPE", "UNAGENT_TO_AGENT");
private String type;
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 aa401db..dca2275 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
@@ -74,6 +74,11 @@
// 非代理推代理，非代理上级拿的收益比例
DataDictionaryCustom indirectPerDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT.getCode());
+
+ // 非代理推代理，非代理上级拿的收益比例
+ DataDictionaryCustom indirectPerTwoDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT_TWO.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT_PARENT_TWO.getCode());
+
+
// 非代理推代理，非代理的直推收益比例
DataDictionaryCustom unAgentDirectDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNAGENT_TO_AGENT.getType(), DataDictionaryEnum.UNAGENT_TO_AGENT.getCode());
@@ -141,13 +146,18 @@
continue;
}
+ int index = 1;
for (MallMember mallMember : mallMembers) {
if (!item.getGoodsLevel().equals(mallMember.getAccountLevel())) {
break;
}
+ if (index != 2) {
+ indirectPerDic = indirectPerTwoDic;
+ }
BigDecimal doubleParentProfit = profit.multiply(new BigDecimal(indirectPerDic.getValue()));
changeScoreAndCommission(mallMember.getId(), doubleParentProfit, MoneyFlowTypeEnum.DIRECT_BONUS.getValue(), orderInfo.getOrderNo());
+ index++;
}
}
// ----- 直推奖 end -------
diff --git a/src/main/resources/templates/febs/views/modules/system/bonusSetting.html b/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
index 9fd60c6..e8d67b3 100644
--- a/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
+++ b/src/main/resources/templates/febs/views/modules/system/bonusSetting.html
@@ -22,12 +22,19 @@
<div class="layui-word-aux" style="margin-left: 150px;">非代理/股东推荐的人购买了代理/股东套餐的直推收益比例</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">非代理推代理父级(%)：</label>
+ <label class="layui-form-label febs-form-item-require">非代理推代理父级第一级(%)：</label>
<div class="layui-input-block">
<input type="text" name="UNAGENT_TO_AGENT_PARENT" lay-verify="required|integer" autocomplete="off" class="layui-input" >
</div>
<div class="layui-word-aux" style="margin-left: 150px;">非代理/股东推荐的人购买了代理/股东套餐的其父级收益比例</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">非代理推代理父级第二级(%)：</label>
+ <div class="layui-input-block">
+ <input type="text" name="UNAGENT_TO_AGENT_PARENT_TWO" lay-verify="required|integer" autocomplete="off" class="layui-input" >
+ </div>
+ <div class="layui-word-aux" style="margin-left: 150px;">非代理/股东推荐的人购买了代理/股东套餐的其父级收益比例</div>
+ </div>
</div>
<div class="layui-card-body">
--
Gitblit v1.9.1