angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "## 奖金拨比汇总服务补贴拨比调整，不算升级；" 

This reverts commit 270495d6
This commit is contained in:
cabbage 2025-06-11 14:09:52 +08:00
parent 87ed7b6e32
commit 727d601c68
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java
View File

@ -106,9 +106,7 @@ public class CuBonusVertexStatisTotalController extends BaseController {
itm.setIntroduceBonusRate(itm.getIntroduceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setIntroduceBonusRate(itm.getIntroduceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
itm.setOrgBonusRate(itm.getOrgBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setOrgBonusRate(itm.getOrgBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
itm.setLeaderBonusRate(itm.getLeaderBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setLeaderBonusRate(itm.getLeaderBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
} itm.setServiceBonusRate(itm.getServiceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
if (itm.getRegAmount().compareTo(BigDecimal.ZERO) > 0) {
itm.setServiceBonusRate(itm.getServiceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRegAmount(), 4, RoundingMode.HALF_UP));
} }
if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) { if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
itm.setRepurRangeBonusRate(itm.getRepurRangeBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRepurchaseAllAmount(), 4, RoundingMode.HALF_UP)); itm.setRepurRangeBonusRate(itm.getRepurRangeBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRepurchaseAllAmount(), 4, RoundingMode.HALF_UP));
@ -188,9 +186,7 @@ public class CuBonusVertexStatisTotalController extends BaseController {
itm.setIntroduceBonusRate(itm.getIntroduceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setIntroduceBonusRate(itm.getIntroduceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
itm.setOrgBonusRate(itm.getOrgBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setOrgBonusRate(itm.getOrgBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
itm.setLeaderBonusRate(itm.getLeaderBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP)); itm.setLeaderBonusRate(itm.getLeaderBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
} itm.setServiceBonusRate(itm.getServiceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
if (itm.getRegAmount().compareTo(BigDecimal.ZERO) > 0) {
itm.setServiceBonusRate(itm.getServiceBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRegAmount(), 4, RoundingMode.HALF_UP));
} }
if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) { if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
itm.setRepurRangeBonusRate(itm.getRepurRangeBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRepurchaseAllAmount(), 4, RoundingMode.HALF_UP)); itm.setRepurRangeBonusRate(itm.getRepurRangeBonus().multiply(cuBonusVertexStaticTotalVO.getPerCent()).divide(itm.getRepurchaseAllAmount(), 4, RoundingMode.HALF_UP));

5
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java
View File

@ -215,11 +215,6 @@ public class CuBonusVertexStaticTotalVO implements Serializable {
*/ */
private Integer pkVertex; private Integer pkVertex;
/**
* 注册金额（用于处理服务补贴波比使用）
*/
private BigDecimal regAmount;
/** /**
* 注册新增PV MAIN_REG_PV * 注册新增PV MAIN_REG_PV
*/ */

5
bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml
View File

@ -360,7 +360,6 @@
sum (cbs.REPUR_RANGE_BONUS) repurRangeBonus, sum (cbs.REPUR_RANGE_BONUS) repurRangeBonus,
sum (cbs.REPUR_ORG_BONUS) repurOrgBonus, sum (cbs.REPUR_ORG_BONUS) repurOrgBonus,
sum (cbs.REPUR_LEADER_BONUS) repurLeaderBonus, sum (cbs.REPUR_LEADER_BONUS) repurLeaderBonus,
sum (cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT) regAmount,,
<!-- 首购相关 --> <!-- 首购相关 -->
sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT)
AS firstPurchaseAll, AS firstPurchaseAll,
@ -480,10 +479,10 @@
/ sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4) / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4)
end AS leaderBonusRate, end AS leaderBonusRate,
case case
WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT) = 0 WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) = 0
THEN 0 THEN 0
ELSE ROUND(#{perCent} * sum(cbs.SERVICE_BONUS) ELSE ROUND(#{perCent} * sum(cbs.SERVICE_BONUS)
/ sum(cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT), 4) / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4)
end AS serviceBonusRate, end AS serviceBonusRate,
<!-- 复购奖金占比 --> <!-- 复购奖金占比 -->
case case