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

## 会员奖金明细福利分红返回字段调整；

This commit is contained in:
cabbage 2025-06-25 14:34:01 +08:00
parent 6b20e56630
commit e6a54d5b23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
View File

@ -181,6 +181,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO); cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO); cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO); cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRetailBenefitIncomeTotal(BigDecimal.ZERO);
memberBonusExtList.add(cuMemberBonusExt); memberBonusExtList.add(cuMemberBonusExt);
} }
} }
@ -230,6 +231,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate)); cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate)); cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate)); cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
// 福利分红总计
cuMemberBonusExt.setRetailBenefitIncomeTotal(cuMemberBonusExt.getRetailBenefitAvgIncome().add(cuMemberBonusExt.getRetailBenefitIncome()));
} }
return cuMemberBonusExtList; return cuMemberBonusExtList;
} }

4
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
View File

@ -108,10 +108,10 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
private BigDecimal retailMonthRepurchaseIncome; private BigDecimal retailMonthRepurchaseIncome;
/** /**
* 福利分红收益 * 福利分红收益总计
*/ */
@BigDecimalFormat @BigDecimalFormat
private BigDecimal retailBenefitIncome; private BigDecimal retailBenefitIncomeTotal;
/** /**
* 新零售收益小计 * 新零售收益小计

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java
View File

@ -78,4 +78,9 @@ public class CuMemberBonusExt extends CuMemberBonus {
*/ */
private String nickName; private String nickName;
/**
* 福利分红收益总计
*/
private BigDecimal retailBenefitIncomeTotal;
} }