From e84a841f722bc38654e2cfe91586248c555aff3c Mon Sep 17 00:00:00 2001 From: Kurisu Date: Wed, 26 Apr 2023 18:09:43 +0800 Subject: [PATCH] feature(*): 增加标识 --- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java | 4 ++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java index 239eac2..438250e 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java @@ -201,8 +201,8 @@ public class PubDistributeBizService { int initCount = minimumClueCountSetting.map(SettingVO::getDetailValue).orElse(50); if (count > initCount) { Optional settingVO = settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.MINIMUM_CONVERSION_RATE, groupId, null); - int minimum_conversion_rate = settingVO.map(SettingVO::getDetailValue).orElse(2000); - BigDecimal rate = BigDecimal.valueOf(minimum_conversion_rate).divide(BigDecimal.valueOf(1000_0), 2, RoundingMode.HALF_UP); + int minimum_conversion_rate = settingVO.map(SettingVO::getDetailValue).orElse(20); + BigDecimal rate = BigDecimal.valueOf(minimum_conversion_rate).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); Optional increaseCountSetting = settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.INCREASE_COUNT, groupId, null); int increaseCount = increaseCountSetting.map(SettingVO::getDetailValue).orElse(10); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java index 722f02f..18197f1 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java @@ -35,7 +35,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; -import java.math.RoundingMode; import java.time.LocalDate; import java.time.MonthDay; import java.util.*; @@ -342,8 +341,7 @@ public class PubStandBizService { }); CompletableFuture future2 = CompletableFuture.runAsync(() -> settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.MINIMUM_CONVERSION_RATE, groupId, null) .ifPresent(r -> { - BigDecimal rate = BigDecimal.valueOf(r.getDetailValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); - standVO.setRatio(rate); + standVO.setRatio(BigDecimal.valueOf(r.getDetailValue())); })); CompletableFuture future3 = CompletableFuture.runAsync(() -> { settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.INCREASE_COUNT, groupId, null) -- libgit2 0.22.2