From 91fac644d346a4ba8edfd238fde430604d1920ee Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 25 Sep 2025 09:48:40 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E9=98=B6=E6=AE=B5=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A5=E6=BA=90=E4=BC=9A=E5=91=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettleRangeHandle.java | 1 + .../mapper/bonus/bonus/CuMemberBonusStageMapper.xml | 4 ++-- .../hzs/common/domain/member/bonus/CuMemberBonusStage.java | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index af4d9618..5d23b740 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -1114,6 +1114,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusStage.setChildNode(bonusStageData.getTargetChildNode()); cuMemberBonusStage.setStage(bonusStageData.getStage()); cuMemberBonusStage.setStageNum(bonusStageData.getStageNum()); + cuMemberBonusStage.setPkSourceMember(sourceMember.getPkMember()); stageIncomeRemark(saOrderExt, cuMemberBonusStage, sourceMember, targetMember); BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusStage, saOrderExt != null ? saOrderExt.getOrderAmount() : null, saOrderExt != null ? saOrderExt.getInExchangeRate() : null); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusStage.getIncomeStatus()) { diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml index 34f3bbdd..4bcea10d 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml @@ -22,13 +22,13 @@ cal_type, cal_achieve, cal_value, pretax_income, income_tax, real_income, remark, 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 ( #{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus}, #{item.calType}, #{item.calAchieve}, #{item.calValue}, #{item.pretaxIncome}, #{item.incomeTax}, #{item.realIncome}, #{item.remark}, #{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio}, - #{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum}) + #{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum}, #{item.pkSourceMember}) SELECT 1 FROM dual diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java index 746a38e0..d67b6fe5 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java @@ -133,5 +133,11 @@ public class CuMemberBonusStage extends BaseEntity { @TableField("STAGE_NUM") private Integer stageNum; + /** + * 来源会员ID + */ + @TableField("PK_SOURCE_MEMBER") + private Long pkSourceMember; + }