From 97a5e59239c2406d3b34fcd17fac15d5981605c6 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 25 Sep 2025 13:35:21 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=B8=89=E9=98=B6=E6=AE=B5=E5=A5=96?= =?UTF-8?q?=E9=87=91=E7=94=9F=E6=88=90=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/service/impl/BonusSettleHandle.java | 68 +++--- .../service/impl/BonusSettleRangeHandle.java | 3 + .../impl/CuMemberBonusStageServiceImpl.java | 17 +- .../achieve/CuMemberRetailRangeMapper.xml | 2 +- .../bonus/achieve/CuMemberTreeMapper.xml | 6 +- .../domain/member/bonus/CuMemberBonus.java | 208 +++++++++++++++++- 6 files changed, 259 insertions(+), 45 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 9873611b..53cb8cda 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -163,43 +163,43 @@ public abstract class BonusSettleHandle { .pkRate(pkRate) .incomeStatus(incomeStatus) .directIncome(BigDecimal.ZERO) -// .expandIncome(BigDecimal.ZERO) -// .expandNoCapping(BigDecimal.ZERO) -// .expandCapping(BigDecimal.ZERO) -// .coachIncome(BigDecimal.ZERO) -// .shareIncome(BigDecimal.ZERO) -// .serviceIncome(BigDecimal.ZERO) -// .backPoints(BigDecimal.ZERO) -// .serviceSpend(BigDecimal.ZERO) -// .purRealSubtotal(BigDecimal.ZERO) -// .repurPushIncome(BigDecimal.ZERO) -// .repurRangeIncome(BigDecimal.ZERO) -// .repurExpandIncome(BigDecimal.ZERO) -// .repurRealSubtotal(BigDecimal.ZERO) -// .cloudDirectIncome(BigDecimal.ZERO) -// .cloudPurIncome(BigDecimal.ZERO) -// .cloudRepurIncome(BigDecimal.ZERO) -// .cloudRealSubtotal(BigDecimal.ZERO) -// .repurCoupon(BigDecimal.ZERO) -// .repurCouponShare(BigDecimal.ZERO) -// .repurCouponSubtotal(BigDecimal.ZERO) + .expandIncome(BigDecimal.ZERO) + .expandNoCapping(BigDecimal.ZERO) + .expandCapping(BigDecimal.ZERO) + .coachIncome(BigDecimal.ZERO) + .shareIncome(BigDecimal.ZERO) + .serviceIncome(BigDecimal.ZERO) + .backPoints(BigDecimal.ZERO) + .serviceSpend(BigDecimal.ZERO) + .purRealSubtotal(BigDecimal.ZERO) + .repurPushIncome(BigDecimal.ZERO) + .repurRangeIncome(BigDecimal.ZERO) + .repurExpandIncome(BigDecimal.ZERO) + .repurRealSubtotal(BigDecimal.ZERO) + .cloudDirectIncome(BigDecimal.ZERO) + .cloudPurIncome(BigDecimal.ZERO) + .cloudRepurIncome(BigDecimal.ZERO) + .cloudRealSubtotal(BigDecimal.ZERO) + .repurCoupon(BigDecimal.ZERO) + .repurCouponShare(BigDecimal.ZERO) + .repurCouponSubtotal(BigDecimal.ZERO) .globalPoints(BigDecimal.ZERO) -// .carAwardPoints(BigDecimal.ZERO) -// .hiFunIncome(BigDecimal.ZERO) -// .haiFunIncome(BigDecimal.ZERO) + .carAwardPoints(BigDecimal.ZERO) + .hiFunIncome(BigDecimal.ZERO) + .haiFunIncome(BigDecimal.ZERO) .storeIncome(BigDecimal.ZERO) -// .makerDirectIncome(BigDecimal.ZERO) -// .makerShareIncome(BigDecimal.ZERO) -// .makerRealSubtotal(BigDecimal.ZERO) + .makerDirectIncome(BigDecimal.ZERO) + .makerShareIncome(BigDecimal.ZERO) + .makerRealSubtotal(BigDecimal.ZERO) .realIncomeTotal(BigDecimal.ZERO) -// .retailRangeIncome(BigDecimal.ZERO) -// .retailSameLevelIncome(BigDecimal.ZERO) -// .retailAreaIncome(BigDecimal.ZERO) -// .retailBenefitRangeIncome(BigDecimal.ZERO) -// .retailMonthRepurchaseIncome(BigDecimal.ZERO) -// .retailBenefitAvgIncome(BigDecimal.ZERO) -// .retailBenefitIncome(BigDecimal.ZERO) -// .retailRealSubtotal(BigDecimal.ZERO) + .retailRangeIncome(BigDecimal.ZERO) + .retailSameLevelIncome(BigDecimal.ZERO) + .retailAreaIncome(BigDecimal.ZERO) + .retailBenefitRangeIncome(BigDecimal.ZERO) + .retailMonthRepurchaseIncome(BigDecimal.ZERO) + .retailBenefitAvgIncome(BigDecimal.ZERO) + .retailBenefitIncome(BigDecimal.ZERO) + .retailRealSubtotal(BigDecimal.ZERO) .build(); cuMemberBonus.setPkCreator(MagicNumberConstants.PK_ADMIN); cuMemberBonus.setPkCountry(pkCountry); 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 6ceef0f0..fb35053c 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 @@ -1003,6 +1003,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { .pointType(EBonusStageType.NORMAL.getValue()) .pointGift(0) .creationTime(settleDate) + .thirdBonus1(0) + .thirdBonus2(0) + .thirdBonus3(0) .updateBool(0) .build(); detailList.put(newRetailDetail.getChildNode(), newRetailDetail); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java index 3b644c17..92aa1f31 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java @@ -278,6 +278,9 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl ) b diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml index 28dd067a..ecced1a8 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml @@ -335,9 +335,9 @@ point_second NUMBER(8), point_member_third NUMBER(20), point_third NUMBER(8), - third_bonus_1 NUMBER(8), - third_bonus_2 NUMBER(8), - third_bonus_3 NUMBER(8) + third_bonus_1 NUMBER(8) default 0 not null, + third_bonus_2 NUMBER(8) default 0 not null, + third_bonus_3 NUMBER(8) default 0 not null ) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java index a9c1f892..3e8d8ded 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonus.java @@ -56,10 +56,124 @@ public class CuMemberBonus extends BaseEntity { private BigDecimal directIncome; /** - * 阶段收益-众康 + * 拓展收益 */ - @TableField("STORE_INCOME") - private BigDecimal storeIncome; + @TableField("EXPAND_INCOME") + private BigDecimal expandIncome; + + /** + * 拓展无封 (拓展收益按等级正常比例结算，并 拓展收益按等级正常比例结算 无封顶) + */ + @TableField("EXPAND_NO_CAPPING") + private BigDecimal expandNoCapping; + + /** + * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益) + */ + @TableField("EXPAND_CAPPING") + private BigDecimal expandCapping; + + /** + * 培育津贴 + */ + @TableField("COACH_INCOME") + private BigDecimal coachIncome; + + /** + * 分红收益 + */ + @TableField("SHARE_INCOME") + private BigDecimal shareIncome; + + /** + * 报单收益 + */ + @TableField("SERVICE_INCOME") + private BigDecimal serviceIncome; + + /** + * 商城重消 + */ + @TableField("BACK_POINTS") + private BigDecimal backPoints; + + /** + * 平台服务费 + */ + @TableField("SERVICE_SPEND") + private BigDecimal serviceSpend; + + /** + * 首购实发小计 + */ + @TableField("PUR_REAL_SUBTOTAL") + private BigDecimal purRealSubtotal; + + /** + * 复购推荐收益 修改为互助收益 cu_member_bonus_push + */ + @TableField("REPUR_PUSH_INCOME") + private BigDecimal repurPushIncome; + + /** + * 复购级差收益 + */ + @TableField("REPUR_RANGE_INCOME") + private BigDecimal repurRangeIncome; + + /** + * 复购拓展收益 + */ + @TableField("REPUR_EXPAND_INCOME") + private BigDecimal repurExpandIncome; + + /** + * 复购实发小计 + */ + @TableField("REPUR_REAL_SUBTOTAL") + private BigDecimal repurRealSubtotal; + + /** + * 云代直推收益 修改为幸运收益 cu_member_bonus_coach + */ + @TableField("CLOUD_DIRECT_INCOME") + private BigDecimal cloudDirectIncome; + + /** + * 云代首购收益 修改为极差收益 cu_member_bonus_range + */ + @TableField("CLOUD_PUR_INCOME") + private BigDecimal cloudPurIncome; + + /** + * 云代复购收益 修改为平级收益 cu_member_bonus_range + */ + @TableField("CLOUD_REPUR_INCOME") + private BigDecimal cloudRepurIncome; + + /** + * 云代实发小计 修改为 极差小计 + */ + @TableField("CLOUD_REAL_SUBTOTAL") + private BigDecimal cloudRealSubtotal; + + /** + * 复购券 + */ + @TableField("REPUR_COUPON") + private BigDecimal repurCoupon; + + /** + * 复购券均分收益 + */ + @TableField("REPUR_COUPON_SHARE") + private BigDecimal repurCouponShare; + + /** + * 复购券小计 + */ + @TableField("REPUR_COUPON_SUBTOTAL") + private BigDecimal repurCouponSubtotal; /** * 复购见点收益-众康 @@ -67,7 +181,95 @@ public class CuMemberBonus extends BaseEntity { @TableField("GLOBAL_POINTS") private BigDecimal globalPoints; + /** + * 车奖积分 + */ + @TableField("CAR_AWARD_POINTS") + private BigDecimal carAwardPoints; + /** + * 阶段收益-众康 + */ + @TableField("STORE_INCOME") + private BigDecimal storeIncome; + + /** + * 嗨粉推荐收益 + */ + @TableField("HI_FUN_INCOME") + private BigDecimal hiFunIncome; + + /** + * 海粉推荐收益 + */ + @TableField("HAI_FUN_INCOME") + private BigDecimal haiFunIncome; + + /** + * 创客空间直推收益 + */ + @TableField("MAKER_DIRECT_INCOME") + private BigDecimal makerDirectIncome; + + /** + * 创客共享收益 + */ + @TableField("MAKER_SHARE_INCOME") + private BigDecimal makerShareIncome; + + /** + * 创客空间收益小计 + */ + @TableField("MAKER_REAL_SUBTOTAL") + private BigDecimal makerRealSubtotal; + + /** + * 新零售直推收益 + */ + @TableField("RETAIL_RANGE_INCOME") + private BigDecimal retailRangeIncome; + + /** + * 新零售平级收益 + */ + @TableField("RETAIL_SAME_LEVEL_INCOME") + private BigDecimal retailSameLevelIncome; + + /** + * 新零售区域分红 + */ + @TableField("RETAIL_AREA_INCOME") + private BigDecimal retailAreaIncome; + + /** + * 新零售福利级差收益 + */ + @TableField("RETAIL_BENEFIT_RANGE_INCOME") + private BigDecimal retailBenefitRangeIncome; + + /** + * 新零售复购级差收益 + */ + @TableField("RETAIL_MONTH_REPURCHASE_INCOME") + private BigDecimal retailMonthRepurchaseIncome; + + /** + * 福利分红平均收益 + */ + @TableField("RETAIL_BENEFIT_AVG_INCOME") + private BigDecimal retailBenefitAvgIncome; + + /** + * 福利分红加权收益 + */ + @TableField("RETAIL_BENEFIT_INCOME") + private BigDecimal retailBenefitIncome; + + /** + * 新零售收益小计 + */ + @TableField("RETAIL_REAL_SUBTOTAL") + private BigDecimal retailRealSubtotal; /** * 实发收益总计