diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java index e12d48ae..efa88474 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java @@ -58,8 +58,8 @@ public class ApiCuMemberBonusController extends BaseController { memberBonusVO.setServiceSpend(BigDecimal.ZERO); memberBonusVO.setSettleDate(DateUtils.currentDate()); BigDecimal serviceSpend = ComputeUtil.computeSubtract( - ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), - cuMemberBonus.getRetailAreaIncome()), cuMemberBonus.getRetailRealSubtotal() + ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()), + cuMemberBonus.getRetailRealSubtotal() ); memberBonusVO.setBackPoints(serviceSpend); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java index 746d7c61..ab0c10e4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java @@ -31,10 +31,6 @@ public enum EBonusItems { * 服务补贴 */ SERVICE_SUBSIDIES(7, "旧服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), - /** - * 复购级差收益 - */ - REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), /** * 消费拓展收益 */ @@ -62,6 +58,11 @@ public enum EBonusItems { ////////////////////////////////////////////////// 新奖项 ////////////////////////////////////////////////// + /** + * 复购级差收益 -- 秒结,日奖 + */ + REPURCHASE_RANGE_INCOME(8, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 8), + /** * 直推收益(新零售直推级差收益) -- 秒结,日奖 */ @@ -78,11 +79,11 @@ public enum EBonusItems { /** * 福利极差收益 -- 月结,月奖 */ - RETAIL_BENEFIT_RANGE_INCOME(30, "福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), + RETAIL_BENEFIT_RANGE_INCOME(30, "月度福利级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 30), /** * 复购级差收益(新) -- 月结,月奖 */ - RETAIL_MONTH_REPURCHASE_INCOME(31, "复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31), + RETAIL_MONTH_REPURCHASE_INCOME(31, "月度复购级差收益", 0, EnumsPrefixConstants.BONUS_ITEMS + 31), /** * 培育津贴(新) -- 月结,月奖 */