diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java index f26ae78..3b65494 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/rewardconfig/impl/RewardConfigQueryServiceImpl.java @@ -121,8 +121,8 @@ public class RewardConfigQueryServiceImpl implements RewardConfigQueryService { RewardConfig downLevelConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_JOIN_RECOMMEND_DOWN_LEVEL); RewardConfig downMaxConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_JOIN_RECOMMEND_DOWN_MAX); if (Objects.nonNull(downLevelConfig) && Objects.nonNull(downMaxConfig)) { - pct = new BigDecimal(equalLevelConfig.getValue()).add(new BigDecimal(downLevelConfig.getValue())); - BigDecimal downMaxPct = new BigDecimal(downLevelConfig.getValue()); + pct = new BigDecimal(equalLevelConfig.getValue()).add(new BigDecimal(downLevelConfig.getValue()).multiply(new BigDecimal(diffValue))); + BigDecimal downMaxPct = new BigDecimal(downMaxConfig.getValue()); pct = pct.compareTo(downMaxPct) < 0 ? pct : downMaxPct; } } @@ -131,7 +131,7 @@ public class RewardConfigQueryServiceImpl implements RewardConfigQueryService { RewardConfig upLevelConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_JOIN_RECOMMEND_UP_LEVEL); RewardConfig upMinConfig = queryByRewardType(RewardTypeEnum.MATCHMAKER_JOIN_RECOMMEND_UP_MIN); if (Objects.nonNull(upLevelConfig) && Objects.nonNull(upMinConfig)) { - pct = new BigDecimal(equalLevelConfig.getValue()).add(new BigDecimal(upLevelConfig.getValue())); + pct = new BigDecimal(equalLevelConfig.getValue()).add(new BigDecimal(upLevelConfig.getValue()).multiply(new BigDecimal(diffValue))); BigDecimal upMinPct = new BigDecimal(upMinConfig.getValue()); pct = pct.compareTo(upMinPct) > 0 ? pct : upMinPct; }