修改

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2023/3/22 15:02
@@ -54,22 +56,27 @@ public class SolutionsDto implements Dto {
     @ApiModelProperty("首付款比例")
     private String downPayRatio;
     @ApiModelProperty("首付金额")
+    @NotBlank(message = "首付金额不能为空")
     private String downPayAmount;
     @ApiModelProperty("贷款金额")
     private String loanAmount;
     @ApiModelProperty("贷款期数")
+    @NotBlank(message = "产品期数不能为空")
     private String loanPeriod;
     @ApiModelProperty("贷款保证金比例")
     private String bondRatio;
     @ApiModelProperty("贷款保证金金额")
+    @NotBlank(message = "贷款保证金不能为空")
     private String bondAmount;
     @ApiModelProperty("厂家贴息")
+    @NotBlank(message = "厂家贴息不能为空")
     private String factoryDiscount;
     @ApiModelProperty("厂家贴息用途")
     private String factoryDiscountUse;
     @ApiModelProperty("年利率")
     private String policyYearRatio;
     @ApiModelProperty("月还金额")
+    @NotBlank(message = "月还金额不能为空")
     private String loanPayMoney;
     @ApiModelProperty("利息总额")
     private String loanInterest;
@@ -115,6 +122,7 @@ public class SolutionsDto implements Dto {
     @ApiModelProperty("落户保证金")
     private String depositSettle;
     @ApiModelProperty("服务费")
+    @NotBlank(message = "服务费不能为空")
     private String serviceAmount;
     @ApiModelProperty("代收意外险")
     private String proxyAccidentPremium;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -490,7 +490,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         } else {//外部金融的只需要录入厂家贴息
             //查询金融方案
             loanSolutions = new LoanSolutions();
-            BeanUtil.copyProperties(dto, loanSolutions);
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
                 loanSolutions.setFactoryDiscount(new BigDecimal(BigInteger.ZERO));
             }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java

@@ -1,5 +1,7 @@
 package com.yxt.anrui.terminal.api.risk.solutions;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,18 +27,25 @@ public class AppSolutionsDetailsVo implements Vo {
     @ApiModelProperty("产品政策名称")
     private String policyName;
     @ApiModelProperty("主车发票价")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String mainVehicleAmount;
     @ApiModelProperty("融资票据")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String accessoriesAmount;
     @ApiModelProperty("挂车金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String trailerAmount;
     @ApiModelProperty("购置税")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String purchaseTax;
     @ApiModelProperty("保险金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String premium;
     @ApiModelProperty("车损上浮")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String vehDamageFloat;
     @ApiModelProperty("融资项目总额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanTotal;
 
     @ApiModelProperty("是否有融资票据")
@@ -55,22 +64,28 @@ public class AppSolutionsDetailsVo implements Vo {
     @ApiModelProperty("首付款比例")
     private String downPayRatio;
     @ApiModelProperty("首付金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String downPayAmount;
     @ApiModelProperty("贷款金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanAmount;
     @ApiModelProperty("贷款期数")
     private String loanPeriod;
     @ApiModelProperty("贷款保证金比例")
     private String bondRatio;
     @ApiModelProperty("贷款保证金金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String bondAmount;
     @ApiModelProperty("厂家贴息")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String factoryDiscount;
     @ApiModelProperty("年利率")
     private String policyYearRatio;
     @ApiModelProperty("月还金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanPayMoney;
     @ApiModelProperty("利息总额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanInterest;
 
     //其他融
@@ -78,23 +93,29 @@ public class AppSolutionsDetailsVo implements Vo {
     @ApiModelProperty("其它融名称")
     private String otherPolicyName;
     @ApiModelProperty("其它融贷款金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String otherPolicyAmount;
     @ApiModelProperty("其它融期数")
     private String otherPolicyPeriod;
     @ApiModelProperty("其它融月还")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String otherPolicyMonthlyRepay;
     @ApiModelProperty("其它融利息总额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String otherPolicyInterest;
 
     @ApiModelProperty("'融资首付")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanDownPay;
     @ApiModelProperty("总贷款金额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String loanAmountTotal;
     @ApiModelProperty("期数")
     private String period;
     @ApiModelProperty("月还金额")
     private String monthlyRepay;
     @ApiModelProperty("利息总额")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String interest;
     @ApiModelProperty("预计首期还款日")
     private String returnTime;
@@ -134,13 +155,18 @@ public class AppSolutionsDetailsVo implements Vo {
     @ApiModelProperty("抵顶购置税")
     private String offsetPurchasetax;
     @ApiModelProperty("抵顶费用合计")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String offsetTotal;
     @ApiModelProperty("应收合计")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String receivableTotal;
     @ApiModelProperty("实收合计")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String realTotal;
     @ApiModelProperty("车辆总价")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String vehTotalPrice;
     @ApiModelProperty("名义留购价")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String nominalPrice;
 }

doc/databases/risk_center.sql

@@ -930,7 +930,7 @@ CREATE TABLE `loan_solutions`
     `bondRatio`           varchar(100)         DEFAULT NULL COMMENT '保证金比例（%）',
     `bondAmount`          decimal(10, 2)       DEFAULT NULL COMMENT '保证金金额',
     `factoryDiscount`     decimal(10, 2)       DEFAULT NULL COMMENT '厂家贴息',
-    `factoryDiscountUse`     varchar(500)         DEFAULT NULL COMMENT '厂家贴息',
+    `factoryDiscountUse`  varchar(500)         DEFAULT NULL COMMENT '厂家贴息',
     `policyYearRatio`     decimal(10, 3)       DEFAULT NULL COMMENT '政策年利率（%）',
     `loanPayMoney`        decimal(10, 2)       DEFAULT NULL COMMENT '贷款月还',
     `loanInterest`        decimal(10, 2)       DEFAULT NULL COMMENT '贷款利息',
@@ -970,7 +970,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
     `loanDownPay`             decimal(10, 2)       DEFAULT NULL COMMENT '融资首付',
     `loanAmountTotal`         decimal(10, 2)       DEFAULT NULL COMMENT '总贷款金额',
     `period`                  varchar(64)          DEFAULT NULL COMMENT '期数',
-    `monthlyRepay`            decimal(10, 2)       DEFAULT NULL COMMENT '月还金额',
+    `monthlyRepay`            varchar(200)         DEFAULT NULL COMMENT '月还金额',
     `interest`                decimal(10, 2)       DEFAULT NULL COMMENT '利息总额',
     `returnTime`              varchar(64)          DEFAULT NULL COMMENT '预计首期还款日',
     `otherPolicyYearRatio`    varchar(64)          DEFAULT NULL COMMENT '年利率',