From e971ca227685e5747b5d84a8353b4eb761166a98 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Sun, 24 Mar 2024 20:09:03 +0800 Subject: [PATCH] 1123 --- .../bashi/dk/controller/app/AppSettingController.java | 10 +++++----- .../java/com/bashi/dk/dto/app/resp/LoansSettingVO.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppSettingController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppSettingController.java index eb1a7b6..75e3830 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppSettingController.java +++ b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppSettingController.java @@ -60,12 +60,12 @@ public class AppSettingController { public AjaxResult loans() { LoansSetting setting = loansSettingService.getLoansSetting(); LoansSettingVO vo = BeanConvertUtil.convertTo(setting, LoansSettingVO::new); - Double minDayServiceRate = Arrays.stream(setting.getServiceRate().split(",")) + Double minDayServiceRate = 0D; + Double minMonthRate = Arrays.stream(setting.getServiceRate().split(",")) .map(Double::valueOf).min(Double::compareTo).orElse(null); - if(minDayServiceRate != null){ - minDayServiceRate = NumberUtil.div(minDayServiceRate, new Double(30D), 4); - }else{ - minDayServiceRate = 0D; + vo.setMinMonthRate(minMonthRate); + if(minMonthRate != null){ + minDayServiceRate = NumberUtil.div(minMonthRate, new Double(30D), 4); } vo.setMinDayServiceRate(minDayServiceRate); return AjaxResult.success(vo); diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/LoansSettingVO.java b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/LoansSettingVO.java index 6b660cc..7129739 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/LoansSettingVO.java +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/LoansSettingVO.java @@ -51,4 +51,6 @@ public class LoansSettingVO { @ApiModelProperty("最小 日息") private Double minDayServiceRate; + private Double minMonthRate; + }