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

## 三阶段奖金处理；

This commit is contained in:
cabbage 2025-09-25 14:04:34 +08:00
parent b18b984b5a
commit 061c951d6a
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
View File

@ -223,8 +223,8 @@ public abstract class BonusSettleHandle {
backRatio = bdBonusDeduct.getBackRatio();
platformRatio = bdBonusDeduct.getPlatformRatio();
}
// cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
// cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
cuMemberBonus.setBackPoints(ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), ComputeUtil.computeBonusMultiply(pretaxIncome, backRatio)));
cuMemberBonus.setServiceSpend(ComputeUtil.computeAdd(cuMemberBonus.getServiceSpend(), ComputeUtil.computeBonusMultiply(pretaxIncome, platformRatio)));
}
/**
@ -233,7 +233,7 @@ public abstract class BonusSettleHandle {
protected void setRetailTotal(BdBonusDeduct bdBonusDeduct, CuMemberBonus cuMemberBonus, Object bonusDetail) {
setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail);
BigDecimal realIncome = ReflectUtils.invokeGetter(bonusDetail, BonusFieldConstants.REAL_INCOME);
// cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
cuMemberBonus.setRetailRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getRetailRealSubtotal(), realIncome));
cuMemberBonus.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonus.getRealIncomeTotal(), realIncome));
}

3
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
View File

@ -278,9 +278,6 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
case BonusConstants.POINT_37:
case BonusConstants.POINT_38:
// 如果填充的点位是第三层，理论上有可能已经全部填满，需要判断是否已经完成
if (EBonusStageStatus.YES.getValue() == targetRetailDetail.getStageStatus()) {
break;
}
boolean isFinish = true;
for (String suffix : BonusConstants.FIELD_LIST) {
if (null == ReflectUtil.getFieldValue(targetRetailDetail, BonusConstants.POINT_MEMBER_FIELD_NAME + suffix)) {

7
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
View File

@ -183,7 +183,7 @@
left join cu_member cm
on cm.pk_id = x.pk_member
) b
on (a.pk_member = b.pk_member and a.child_node = b.child_node)
on (a.pk_member = b.pk_member and a.child_node = b.child_node and a.stage = b.stage)
when not matched then
insert (pk_member,
child_node,
@ -280,7 +280,6 @@
when matched then
update set
a.pk_parent = b.pk_parent,
a.stage = b.stage,
a.stage_status = b.stage_status,
a.stage_date = b.stage_date,
a.point_11 = b.point_11,
@ -392,7 +391,7 @@
from dual
</foreach>
) b
on (a.pk_member = b.pk_member and a.child_node = b.child_node)
on (a.pk_member = b.pk_member and a.child_node = b.child_node and a.stage = b.stage)
when not matched then
insert (pk_member, child_node, pk_parent,
stage, stage_status, stage_date,
@ -440,7 +439,7 @@
b.third_bonus_1, b.third_bonus_2, b.third_bonus_3)
when matched then
update set
a.stage = b.stage, a.stage_status = b.stage_status, a.stage_date = b.stage_date,
a.stage_status = b.stage_status, a.stage_date = b.stage_date,
a.point_11 = b.point_11, a.point_12 = b.point_12,
a.point_21 = b.point_21, a.point_22 = b.point_22,
a.point_23 = b.point_23, a.point_24 = b.point_24,