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 993c9e8d..a711ec19 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 @@ -523,7 +523,7 @@ public abstract class BonusSettleHandle { } /** - * 获得 报单服务费收益的备注 + * 获得 福利极差收益 备注 * * @param saOrderExt 订单编号 * @param cuMemberBonusRange 报单服务费 @@ -539,6 +539,23 @@ public abstract class BonusSettleHandle { cuMemberBonusRange.setRemark(remark); } + /** + * 获得 复购极差收益 备注 + * + * @param saOrderExt 订单编号 + * @param cuMemberBonusRange 报单服务费 + * @param sourceMemberRangeExt 提供奖金的人 + * @param targetMemberRangeExt 获得奖金的人 + */ + protected void rangeMonthRepurchaseRetailRemark(SaOrder saOrderExt, CuMemberBonusRange cuMemberBonusRange, CuMemberRetailRangeExt sourceMemberRangeExt, + CuMemberRetailRangeExt targetMemberRangeExt) { + String remark = String.format(BonusMsgConstants.RETAIL_MONTH_REPURCHASE_INCOME, saOrderExt.getOrderCode(), + sourceMemberRangeExt.getMemberCode() + sourceMemberRangeExt.getMemberName(), + targetMemberRangeExt.getMemberCode() + targetMemberRangeExt.getMemberName(), + cuMemberBonusRange.getCalAchieve(), sourceMemberRangeExt.getAwardsName(), targetMemberRangeExt.getAwardsName()); + cuMemberBonusRange.setRemark(remark); + } + /** * 获得 平级收益的备注 * 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 ec84472e..7d752c7d 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 @@ -1998,10 +1998,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { cuMemberBonusRange.setPkRange(targetMemberRangeExt.getPkGrade()); cuMemberBonusRange.setPkBeforeRange(sourceMemberRetailRangeExt.getPkGrade()); cuMemberBonusRange.setPkOrderItems(0L); - rangeBenefitRetailRemark(saOrder, cuMemberBonusRange, sourceMemberRetailRangeExt, targetMemberRangeExt); + rangeMonthRepurchaseRetailRemark(saOrder, cuMemberBonusRange, sourceMemberRetailRangeExt, targetMemberRangeExt); BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusRange, saOrder.getOrderAmount(), BigDecimal.ONE); if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusRange.getIncomeStatus()) { - cuMemberBonus.setRetailMonthRepurchaseIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailBenefitRangeIncome(), cuMemberBonusRange.getPretaxIncome())); + cuMemberBonus.setRetailMonthRepurchaseIncome(ComputeUtil.computeAdd(cuMemberBonus.getRetailMonthRepurchaseIncome(), cuMemberBonusRange.getPretaxIncome())); setRetailTotal(bdBonusDeduct, cuMemberBonus, cuMemberBonusRange); } memberBonusRangeList.add(cuMemberBonusRange); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java index c4934c82..b85a08e3 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java @@ -16,7 +16,7 @@ public class BonusMsgConstants { * 直推收益备注 -- 订单编号%s,%s为%s贡献了推荐收益,推荐收益为%f。 */ public static String RECOMMEND_DIRECT = "订单编号%s,%s为%s贡献了推荐收益,推荐收益为%f。"; - public static String RECOMMEND_SPECIAL_DIRECT = "订单编号%s,%s为%s贡献了乐学易考推荐极差收益,推荐极差收益为%f。"; + public static String RECOMMEND_SPECIAL_DIRECT = "订单编号%s,%s为%s贡献了乐学易考推荐级差收益,推荐级差收益为%f。"; /** * 拓展收益备注 -- 当前是第%d碰,共%d碰,订单编号%s,%s为%s贡献了拓展收益,计算业绩%f,拓展比例%f。 */ @@ -98,16 +98,21 @@ public class BonusMsgConstants { /** * 复购拓展收益备注 -- 当前是第%d碰,共%d碰,订单编号%s,%s为%s贡献了复购拓展收益,计算业绩%f,拓展比例%f。 */ -// public static String REPURCHASE_EXPAND = "MSG_BONUS_016"; public static String REPURCHASE_EXPAND = "当前是第%d碰,共%d碰,订单编号%s,%s为%s贡献了复购拓展收益,计算业绩%f,拓展比例%f。"; /** - * 复购极差 -- 订单编号%s,%s为%s贡献了分享极差收益,计算业绩%f,前一极差等级名称%s,当前极差等级名称%s。 + * 复购级差 -- 订单编号%s,%s为%s贡献了分享级差收益,计算业绩%f,前一级差等级名称%s,当前级差等级名称%s。 */ -// public static String SHARE_RANGE = "MSG_BONUS_017"; - public static String SHARE_RANGE = "订单编号%s,%s为%s贡献了复购极差收益,计算业绩%f,前一极差等级名称%s,当前极差等级名称%s。"; + public static String SHARE_RANGE = "订单编号%s,%s为%s贡献了复购级差收益,计算业绩%f,前一级差等级名称%s,当前级差等级名称%s。"; - public static String RETAIL_RANGE = "订单编号%s,%s为%s贡献了福利极差收益,计算业绩%f,前一极差等级名称%s,当前极差等级名称%s。"; + /** + * 月度福利级差 + */ + public static String RETAIL_RANGE = "订单编号%s,%s为%s贡献了福利级差收益,计算业绩%f,前一级差等级名称%s,当前级差等级名称%s。"; + /** + * 月度复购级差 + */ + public static String RETAIL_MONTH_REPURCHASE_INCOME = "订单编号%s,%s为%s贡献了复购级差收益,计算业绩%f,前一级差等级名称%s,当前级差等级名称%s。"; /** * 直推级差收益说明 @@ -119,13 +124,13 @@ public class BonusMsgConstants { */ public static String ORI_RANGE = "订单编号%s,%s为%s贡献了平级收益,计算业绩%f,等级名称%s。"; - public static String LE_SHARE_RANGE = "订单编号%s,%s为%s贡献了复购极差收益,收益%f。"; + public static String LE_SHARE_RANGE = "订单编号%s,%s为%s贡献了复购级差收益,收益%f。"; /** - * 分享极差 -- 订单编号%s,%s为%s贡献了分享极差收益(乐学易考),使用代金券%f,当前等级%s。 + * 分享级差 -- 订单编号%s,%s为%s贡献了分享级差收益(乐学易考),使用代金券%f,当前等级%s。 */ // public static String LE_XUE_SHARE_RANGE = "MSG_BONUS_018"; - public static String LE_XUE_SHARE_RANGE = "订单编号%s,%s为%s贡献了分享极差收益(乐学易考),使用代金券%f,当前等级%s。"; + public static String LE_XUE_SHARE_RANGE = "订单编号%s,%s为%s贡献了分享级差收益(乐学易考),使用代金券%f,当前等级%s。"; /** * 复购券收益 -- 订单编号%s,%s为%s贡献了复购券收益,计算业绩%f,计算比例%f,复购券收益%f。