diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java index bc788a6..f7d627b 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java +++ b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppBorrowController.java @@ -25,6 +25,8 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/app/borrow") @Api(value = "贷款相关的接口", tags = {"贷款相关的接口"}) @@ -74,6 +76,7 @@ public class AppBorrowController { BorrowInfo borrowInfo = BeanConvertUtil.convertTo(borrow, BorrowInfo::new); LoanProcessResp stepBorrow = borrowService.parseStepBorrow(borrow); borrowInfo.setLoanProcessResp(stepBorrow); + borrowInfo.setDefaultCoinUnit(homeSettingService.getHomeSetting().getDefaultCoinUnit()); return AjaxResult.success(borrowInfo); } diff --git a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppHomeController.java b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppHomeController.java index 7218d86..dd238b4 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppHomeController.java +++ b/bashi-dk/src/main/java/com/bashi/dk/controller/app/AppHomeController.java @@ -36,6 +36,7 @@ public class AppHomeController { private LoansSettingService loansSettingService; @Autowired private HomeSettingService homeSettingService; + @GetMapping("/defaultLocal") @ApiOperation(value = "获取默认语言") public AjaxResult defaultLocal(){ @@ -63,6 +64,7 @@ public class AppHomeController { } Loan loan = calLoanManager.calLoan(calLoanReq); CalLoanResp calLoanResp = BeanConvertUtil.convertTo(loan, CalLoanResp::new); + calLoanResp.setDefaultCoinUnit(homeSettingService.getHomeSetting().getDefaultCoinUnit()); return AjaxResult.success(calLoanResp); } diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/BorrowInfo.java b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/BorrowInfo.java index 6f8361e..3304c1e 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/BorrowInfo.java +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/BorrowInfo.java @@ -11,4 +11,5 @@ public class BorrowInfo extends Borrow { @ApiModelProperty("贷款进度条") private LoanProcessResp loanProcessResp; + private String defaultCoinUnit; } diff --git a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/CalLoanResp.java b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/CalLoanResp.java index cafae45..6a56aab 100644 --- a/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/CalLoanResp.java +++ b/bashi-dk/src/main/java/com/bashi/dk/dto/app/resp/CalLoanResp.java @@ -12,6 +12,8 @@ public class CalLoanResp { @ApiModelProperty("贷款总额") private BigDecimal totalLoanMoney; // + @ApiModelProperty("货币单位") + private String defaultCoinUnit; @ApiModelProperty("还款月份") private int totalMonth; // @ApiModelProperty("贷款年利率") 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 7307154..6b660cc 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 @@ -50,4 +50,5 @@ public class LoansSettingVO { */ @ApiModelProperty("最小 日息") private Double minDayServiceRate; + }