From 9c279b788e774427b9b5b9445baf9bc8b710182d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 24 Jul 2025 11:48:08 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8B=93=E5=B1=95=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E7=83=A7=E4=BC=A4=E6=8B=86=E5=88=86=E4=B8=A4=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BonusSettleFirstPurchaseHandle.java | 1 - .../impl/BonusSettleNewExpandHandle.java | 2 +- .../service/impl/BdBonusItemsServiceImpl.java | 28 +++++++++++-------- .../hzs/common/core/enums/EBonusItems.java | 6 ++-- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index e994ec1f..b3952962 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -978,7 +978,6 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { BigDecimal maxIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), gradeExpandRatio); // actualIncome = 业绩 * 等级扩展比例 BigDecimal actualIncome = ComputeUtil.computeBonusMultiply(cuMemberBonusExpand.getCalAchieve(), countryExpandRatio); -// log.info("首购. maxIncome: {}, gradeExpandRatio: {}; actualIncome: {}, countryExpandRatio: {}", maxIncome, gradeExpandRatio, actualIncome, countryExpandRatio); // K值设置 if (riskControlMap.containsKey(cuMemberBonus.getPkMember())) { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java index 733bb51e..8ff91ac4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleNewExpandHandle.java @@ -382,7 +382,7 @@ public class BonusSettleNewExpandHandle extends BonusSettleHandle { packageCuMemberBonusExpand(cuMemberBonusExpand, cuMemberBonus, bdGrade.getExpandCapping(), realIncome, realIncome); 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()) { // V3 V4 没有烧伤，改为延缓发放 if (EGrade.VIP.getValue() == bdGrade.getGradeValue() diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java index c6dd50ec..9aee4b52 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusItemsServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.CacheConstants; 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.utils.ComputeUtil; import com.hzs.common.core.utils.StringUtils; @@ -32,18 +33,21 @@ public class BdBonusItemsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BdBonusItems::getBonusValue, value.getValue()); - queryWrapper.eq(BdBonusItems::getPkCountry, pkCountry); - BdBonusItems items = baseMapper.selectOne(queryWrapper); - if (StringUtils.isNull(items)) { - baseMapper.insert(bonusItems); - redisService.deleteObject(CacheConstants.BD_BONUS_ITEMS + SecurityUtils.getPkCountry()); + if (EYesNo.YES.getIntValue() == value.getEnable()) { + // 只创建启用的奖项 + bonusItems.setBonusName(value.getLabel()); + bonusItems.setBonusValue(value.getValue()); + bonusItems.setPkCountry(pkCountry); + bonusItems.setPkCreator(SecurityUtils.getUserId()); + bonusItems.setCreationTime(new Date()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdBonusItems::getBonusValue, value.getValue()); + queryWrapper.eq(BdBonusItems::getPkCountry, pkCountry); + BdBonusItems items = baseMapper.selectOne(queryWrapper); + if (StringUtils.isNull(items)) { + baseMapper.insert(bonusItems); + redisService.deleteObject(CacheConstants.BD_BONUS_ITEMS + SecurityUtils.getPkCountry()); + } } } return true; 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 b826cb1b..6386a17f 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 @@ -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), ;