angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 复购级差会员显示字段权限调整；

This commit is contained in:
cabbage 2025-07-09 14:47:30 +08:00
parent 2f6ce5d97e
commit 192be3ff98
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
View File

@ -58,8 +58,8 @@ public class ApiCuMemberBonusController extends BaseController {
memberBonusVO.setServiceSpend(BigDecimal.ZERO); memberBonusVO.setServiceSpend(BigDecimal.ZERO);
memberBonusVO.setSettleDate(DateUtils.currentDate()); memberBonusVO.setSettleDate(DateUtils.currentDate());
BigDecimal serviceSpend = ComputeUtil.computeSubtract( BigDecimal serviceSpend = ComputeUtil.computeSubtract(
ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), ComputeUtil.computeAddNum(cuMemberBonus.getRetailRangeIncome(), cuMemberBonus.getRetailSameLevelIncome(), cuMemberBonus.getRetailAreaIncome(), cuMemberBonus.getRepurRangeIncome()),
cuMemberBonus.getRetailAreaIncome()), cuMemberBonus.getRetailRealSubtotal() cuMemberBonus.getRetailRealSubtotal()
); );
memberBonusVO.setBackPoints(serviceSpend); memberBonusVO.setBackPoints(serviceSpend);

13
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBonusItems.java
View File

@ -31,10 +31,6 @@ public enum EBonusItems {
* 服务补贴 * 服务补贴
*/ */
SERVICE_SUBSIDIES(7, "旧服务补贴", 0, EnumsPrefixConstants.BONUS_ITEMS + 7), 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),
/** /**
* 培育津贴（新） -- 月结，月奖 * 培育津贴（新） -- 月结，月奖
*/ */