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

## 拓展收益烧伤拆分两条数据处理；

This commit is contained in:
cabbage 2025-07-24 11:48:08 +08:00
parent 6b2dcbac8c
commit 9c279b788e
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java
View File

@ -978,7 +978,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle {
BigDecimal maxIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), gradeExpandRatio); BigDecimal maxIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), gradeExpandRatio);
// actualIncome = 业绩 * 等级扩展比例 // actualIncome = 业绩 * 等级扩展比例
BigDecimal actualIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), countryExpandRatio); BigDecimal actualIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), countryExpandRatio);
// log.info("首购. maxIncome: {}, gradeExpandRatio: {}; actualIncome: {}, countryExpandRatio: {}", maxIncome, gradeExpandRatio, actualIncome, countryExpandRatio);
// K值设置 // K值设置
if (riskControlMap.containsKey(cuMemberBonus.getPkMember())) { if (riskControlMap.containsKey(cuMemberBonus.getPkMember())) {

2
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java
View File

@ -382,7 +382,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle {
packageCuMemberBonusExpand(cuMemberBonusExpand, cuMemberBonus, bdGrade.getExpandCapping(), realIncome, realIncome); packageCuMemberBonusExpand(cuMemberBonusExpand, cuMemberBonus, bdGrade.getExpandCapping(), realIncome, realIncome);
CuMemberBonusExpand fireCuMemberBonusExpand = BeanUtil.copyProperties(cuMemberBonusExpand, CuMemberBonusExpand.class); CuMemberBonusExpand fireCuMemberBonusExpand = BeanUtil.copyProperties(cuMemberBonusExpand, CuMemberBonusExpand.class);
BigDecimal fireIncome = ComputeUtil.computeSubtract(maxIncome, realIncome); BigDecimal fireIncome = ComputeUtil.computeSubtract(actualIncome, realIncome);
if (EBonusIncomeStatus.NORMAL.getValue() == fireCuMemberBonusExpand.getIncomeStatus()) { if (EBonusIncomeStatus.NORMAL.getValue() == fireCuMemberBonusExpand.getIncomeStatus()) {
// V3 V4 没有烧伤，改为延缓发放 // V3 V4 没有烧伤，改为延缓发放
if (EGrade.VIP.getValue() == bdGrade.getGradeValue() if (EGrade.VIP.getValue() == bdGrade.getGradeValue()

28
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.enums.EBonusItems; import com.hzs.common.core.enums.EBonusItems;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.core.service.RedisService; import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.StringUtils;
@ -32,18 +33,21 @@ public class BdBonusItemsServiceImpl extends ServiceImpl<BdBonusItemsMapper, BdB
public boolean generate(BdBonusItems bonusItems) { public boolean generate(BdBonusItems bonusItems) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
for (EBonusItems value : EBonusItems.values()) { for (EBonusItems value : EBonusItems.values()) {
bonusItems.setBonusName(value.getLabel()); if (EYesNo.YES.getIntValue() == value.getEnable()) {
bonusItems.setBonusValue(value.getValue()); // 只创建启用的奖项
bonusItems.setPkCountry(pkCountry); bonusItems.setBonusName(value.getLabel());
bonusItems.setPkCreator(SecurityUtils.getUserId()); bonusItems.setBonusValue(value.getValue());
bonusItems.setCreationTime(new Date()); bonusItems.setPkCountry(pkCountry);
LambdaQueryWrapper<BdBonusItems> queryWrapper = new LambdaQueryWrapper<>(); bonusItems.setPkCreator(SecurityUtils.getUserId());
queryWrapper.eq(BdBonusItems::getBonusValue, value.getValue()); bonusItems.setCreationTime(new Date());
queryWrapper.eq(BdBonusItems::getPkCountry, pkCountry); LambdaQueryWrapper<BdBonusItems> queryWrapper = new LambdaQueryWrapper<>();
BdBonusItems items = baseMapper.selectOne(queryWrapper); queryWrapper.eq(BdBonusItems::getBonusValue, value.getValue());
if (StringUtils.isNull(items)) { queryWrapper.eq(BdBonusItems::getPkCountry, pkCountry);
baseMapper.insert(bonusItems); BdBonusItems items = baseMapper.selectOne(queryWrapper);
redisService.deleteObject(CacheConstants.BD_BONUS_ITEMS + SecurityUtils.getPkCountry()); if (StringUtils.isNull(items)) {
baseMapper.insert(bonusItems);
redisService.deleteObject(CacheConstants.BD_BONUS_ITEMS + SecurityUtils.getPkCountry());
}
} }
} }
return true; return true;

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

@ -35,7 +35,7 @@ public enum EBonusItems {
/** /**
* 分红收益 * 分红收益
*/ */
DIVIDEND_INCOME(6, "分红收益", 0), DIVIDEND_INCOME(6, "分红收益", 1),
/** /**
* 服务补贴 * 服务补贴
*/ */
@ -111,12 +111,12 @@ public enum EBonusItems {
/** /**
* 见点收益 * 见点收益
*/ */
REPURCHASE_POINT_INCOME(25, "见点收益", 0), REPURCHASE_POINT_INCOME(26, "见点收益", 0),
/** /**
* 区域收益 * 区域收益
*/ */
REPURCHASE_AREA_INCOME(25, "区域收益", 0), REPURCHASE_AREA_INCOME(27, "区域收益", 0),
; ;