diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 5d15657329..e3c7a40919 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -140,6 +140,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; @@ -256,6 +258,9 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetails(saleOrderSid); + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + if (solutionsDetailsVo == null) { + vo.setFinanceInfoState(0); + } else { + vo.setFinanceInfoState(1); + } + //补充说明状态 if (StringUtils.isNotBlank(busSalesOrder.getNotes()) || StringUtils.isNotBlank(busSalesOrder.getImagesFile())) { vo.setRemarksStete(1); @@ -1481,22 +1501,22 @@ public class BusSalesOrderService extends MybatisBaseService vinSids = new ArrayList<>(); - if (modelInfo != null){ + if (modelInfo != null) { List vinListsVos = modelInfo.getVinListsVos(); for (VinListsVo vinListsVo : vinListsVos) { - if (StringUtils.isNotBlank(vinListsVo.getVinSid())){ + if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { vinSids.add(vinListsVo.getVinSid()); } } } - if (vinSids.size() > 0){ + if (vinSids.size() > 0) { int i = busHandoverService.selectByCount(record.getContractId(), vinSids); if (record.isShowStopBtn() && i < vinSids.size()) { record.setShowStopBtn(true); } else { record.setShowStopBtn(false); } - }else { + } else { record.setShowStopBtn(false); } if (StringUtils.isNotBlank(record.getCustomerImage())) { diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java index 2f257242df..b8ad5a1bde 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2023/3/22 11:40 @@ -14,6 +16,7 @@ public class SolutionsDetailsVo implements Vo { private static final long serialVersionUID = 2678358838559733044L; //金融方案主表 + private String type; private String typeKey; private Integer isPack; @@ -57,6 +60,7 @@ public class SolutionsDetailsVo implements Vo { private String loanInterest; //其他融 + @ApiModelProperty("其它融名称") private String otherPolicyName; @ApiModelProperty("其它融金额") @@ -68,8 +72,22 @@ public class SolutionsDetailsVo implements Vo { @ApiModelProperty("其它融利息总额") private String otherPolicyInterest; + @ApiModelProperty("'融资首付") + private BigDecimal loanDownPay; + @ApiModelProperty("总贷款金额") + private BigDecimal loanAmountTotal; + @ApiModelProperty("期数") + private Integer period; + @ApiModelProperty("月还金额") + private BigDecimal monthlyRepay; + @ApiModelProperty("利息总额") + private BigDecimal interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + //金融方案费用明细 + @ApiModelProperty("融资首付") private String downPayAmounts; @ApiModelProperty("贷款保证金") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java index e6bc3739d0..5f0a6464a0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDto.java +++ b/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 java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2023/3/22 15:02 @@ -14,6 +16,7 @@ public class SolutionsDto implements Dto { private static final long serialVersionUID = 3094344495849727373L; //金融方案主表 + private String saleOrderSid; private String type; private String typeKey; @@ -58,6 +61,7 @@ public class SolutionsDto implements Dto { private String loanInterest; //其他融 + @ApiModelProperty("其它融名称") private String otherPolicyName; @ApiModelProperty("其它融金额") @@ -69,8 +73,22 @@ public class SolutionsDto implements Dto { @ApiModelProperty("其它融利息总额") private String otherPolicyInterest; + @ApiModelProperty("'融资首付") + private BigDecimal loanDownPay; + @ApiModelProperty("总贷款金额") + private BigDecimal loanAmountTotal; + @ApiModelProperty("期数") + private Integer period; + @ApiModelProperty("月还金额") + private BigDecimal monthlyRepay; + @ApiModelProperty("利息总额") + private BigDecimal interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + //金融方案费用明细 + @ApiModelProperty("融资首付") private String downPayAmounts; @ApiModelProperty("贷款保证金") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java index af1fcbd24b..e0d778fda0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsotherpolicy/LoanSolutionsOtherpolicy.java @@ -64,5 +64,18 @@ public class LoanSolutionsOtherpolicy extends BaseEntity { private BigDecimal otherPolicyMonthlyRepay; @ApiModelProperty("其它融利息总额") private BigDecimal otherPolicyInterest; + @ApiModelProperty("'融资首付") + private BigDecimal loanDownPay; + @ApiModelProperty("总贷款金额") + private BigDecimal loanAmountTotal; + @ApiModelProperty("期数") + private Integer period; + @ApiModelProperty("月还金额") + private BigDecimal monthlyRepay; + @ApiModelProperty("利息总额") + private BigDecimal interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + } diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql index 0a9bad001f..9f6c48c53e 100644 --- a/doc/databases/risk_center.sql +++ b/doc/databases/risk_center.sql @@ -959,6 +959,12 @@ CREATE TABLE `loan_solutions_otherPolicy` `otherPolicyPeriod` int(10) DEFAULT NULL COMMENT '其它融期数', `otherPolicyMonthlyRepay` decimal(10, 2) DEFAULT NULL COMMENT '其它融月还', `otherPolicyInterest` decimal(10, 2) DEFAULT NULL COMMENT '其它融利息总额', + `loanDownPay` decimal(10, 2) DEFAULT NULL COMMENT '融资首付', + `loanAmountTotal` decimal(10, 2) DEFAULT NULL COMMENT '总贷款金额', + `period` int(32) DEFAULT NULL COMMENT '期数', + `monthlyRepay` decimal(10, 2) DEFAULT NULL COMMENT '月还金额', + `interest` decimal(10, 2) DEFAULT NULL COMMENT '利息总额', + `returnTime` varchar(64) DEFAULT NULL COMMENT '预计首期还款日', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB