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 09:48:40 +08:00
parent f50645d5ab
commit 91fac644d3
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
View File

@ -1114,6 +1114,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
cuMemberBonusStage.setChildNode(bonusStageData.getTargetChildNode()); cuMemberBonusStage.setChildNode(bonusStageData.getTargetChildNode());
cuMemberBonusStage.setStage(bonusStageData.getStage()); cuMemberBonusStage.setStage(bonusStageData.getStage());
cuMemberBonusStage.setStageNum(bonusStageData.getStageNum()); cuMemberBonusStage.setStageNum(bonusStageData.getStageNum());
cuMemberBonusStage.setPkSourceMember(sourceMember.getPkMember());
stageIncomeRemark(saOrderExt, cuMemberBonusStage, sourceMember, targetMember); stageIncomeRemark(saOrderExt, cuMemberBonusStage, sourceMember, targetMember);
BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusStage, saOrderExt != null ? saOrderExt.getOrderAmount() : null, saOrderExt != null ? saOrderExt.getInExchangeRate() : null); BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusStage, saOrderExt != null ? saOrderExt.getOrderAmount() : null, saOrderExt != null ? saOrderExt.getInExchangeRate() : null);
if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusStage.getIncomeStatus()) { if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusStage.getIncomeStatus()) {

4
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml
View File

@ -22,13 +22,13 @@
cal_type, cal_achieve, cal_value, cal_type, cal_achieve, cal_value,
pretax_income, income_tax, real_income, remark, pretax_income, income_tax, real_income, remark,
income_ratio, income_dial_ratio, order_dial_ratio, income_ratio, income_dial_ratio, order_dial_ratio,
pk_creator, child_node, stage, stage_num) pk_creator, child_node, stage, stage_num, pk_source_member)
values ( values (
#{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus}, #{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus},
#{item.calType}, #{item.calAchieve}, #{item.calValue}, #{item.calType}, #{item.calAchieve}, #{item.calValue},
#{item.pretaxIncome}, #{item.incomeTax}, #{item.realIncome}, #{item.remark}, #{item.pretaxIncome}, #{item.incomeTax}, #{item.realIncome}, #{item.remark},
#{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio}, #{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio},
#{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum}) #{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum}, #{item.pkSourceMember})
</foreach> </foreach>
SELECT 1 FROM dual SELECT 1 FROM dual
</insert> </insert>

6
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java
View File

@ -133,5 +133,11 @@ public class CuMemberBonusStage extends BaseEntity {
@TableField("STAGE_NUM") @TableField("STAGE_NUM")
private Integer stageNum; private Integer stageNum;
/**
* 来源会员ID
*/
@TableField("PK_SOURCE_MEMBER")
private Long pkSourceMember;
} }