Commit e84a841f722bc38654e2cfe91586248c555aff3c
1 parent
4a0a85e8
feature(*): 增加标识
- 增加标识
Showing
2 changed files
with
3 additions
and
5 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubDistributeBizService.java
... | ... | @@ -201,8 +201,8 @@ public class PubDistributeBizService { |
201 | 201 | int initCount = minimumClueCountSetting.map(SettingVO::getDetailValue).orElse(50); |
202 | 202 | if (count > initCount) { |
203 | 203 | Optional<SettingVO> settingVO = settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.MINIMUM_CONVERSION_RATE, groupId, null); |
204 | - int minimum_conversion_rate = settingVO.map(SettingVO::getDetailValue).orElse(2000); | |
205 | - BigDecimal rate = BigDecimal.valueOf(minimum_conversion_rate).divide(BigDecimal.valueOf(1000_0), 2, RoundingMode.HALF_UP); | |
204 | + int minimum_conversion_rate = settingVO.map(SettingVO::getDetailValue).orElse(20); | |
205 | + BigDecimal rate = BigDecimal.valueOf(minimum_conversion_rate).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); | |
206 | 206 | |
207 | 207 | Optional<SettingVO> increaseCountSetting = settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.INCREASE_COUNT, groupId, null); |
208 | 208 | int increaseCount = increaseCountSetting.map(SettingVO::getDetailValue).orElse(10); | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/pub/PubStandBizService.java
... | ... | @@ -35,7 +35,6 @@ import org.springframework.util.Assert; |
35 | 35 | import org.springframework.util.CollectionUtils; |
36 | 36 | |
37 | 37 | import java.math.BigDecimal; |
38 | -import java.math.RoundingMode; | |
39 | 38 | import java.time.LocalDate; |
40 | 39 | import java.time.MonthDay; |
41 | 40 | import java.util.*; |
... | ... | @@ -342,8 +341,7 @@ public class PubStandBizService { |
342 | 341 | }); |
343 | 342 | CompletableFuture<Void> future2 = CompletableFuture.runAsync(() -> settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.MINIMUM_CONVERSION_RATE, groupId, null) |
344 | 343 | .ifPresent(r -> { |
345 | - BigDecimal rate = BigDecimal.valueOf(r.getDetailValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); | |
346 | - standVO.setRatio(rate); | |
344 | + standVO.setRatio(BigDecimal.valueOf(r.getDetailValue())); | |
347 | 345 | })); |
348 | 346 | CompletableFuture<Void> future3 = CompletableFuture.runAsync(() -> { |
349 | 347 | settingBizService.querySettingByType(FollowTypeEnum.OT, SettingTypeEnum.INCREASE_COUNT, groupId, null) | ... | ... |