diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index b0ed609c6a..288dd2eab8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -2227,13 +2227,14 @@ public class CommonContractService extends MybatisBaseService
* File: BusSalesOrderReturnVehApplyVo.java
@@ -76,4 +76,6 @@ public class BusSalesOrderReturnVehApplyVo implements Vo {
private String procInsId; // 流程实例id
@ApiModelProperty("任务编号id")
private String deployId; // 任务编号id
+
+ private String procDefId;
}
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 e169a9782d..c2c627ef7a 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
@@ -1572,7 +1572,7 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetails(saleOrderSid);
+ ResultBean solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(saleOrderSid);
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo == null) {
vo.setFinanceInfoState(0);
@@ -3708,7 +3708,7 @@ public class BusSalesOrderService extends MybatisBaseService solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetails(bv.getBusinessSid());
+ ResultBean solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(bv.getBusinessSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdantuicheFlow/salesorderbycarDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdantuicheFlow/salesorderbycarDaiBanInfo.vue
index f7835f2ef4..2ee135b207 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdantuicheFlow/salesorderbycarDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdantuicheFlow/salesorderbycarDaiBanInfo.vue
@@ -373,5 +373,8 @@ export default {
}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue
index fbb733148b..fb15fa647a 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue
@@ -201,7 +201,7 @@ export default {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
- procInsId: row.procInstId,
+ procInsId: row.procInsId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java
index 617ea59841..c6b3f4eb71 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java
@@ -162,4 +162,5 @@ public class AppCrmCustomerTempDto implements Dto {
@ApiModelProperty("身份证正反面")
private List filePaths = Collections.emptyList();
+
}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
index cbcc0a4fbd..a0f473f5e1 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
@@ -138,4 +138,7 @@ public class CrmCustomerTempDto implements Dto {
private List crmVisitAppendixDtoList;
+ private String orgPath;
+
+
}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 4f9e127485..367f28d61c 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -180,9 +180,9 @@ public class CrmCustomerTempService extends MybatisBaseService qw = new QueryWrapper<>();
String orgSid = "";
- if(StringUtils.isNotBlank(query.getOrgPath())){
+ if (StringUtils.isNotBlank(query.getOrgPath())) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
- qw.eq("ct.createOrgSid",orgSid);
+ qw.eq("ct.createOrgSid", orgSid);
}
- qw.eq("ct.staffSid",staffSid);
+ qw.eq("ct.staffSid", staffSid);
List list = baseMapper.selectCustomerList(qw);
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
- public ResultBean sendFinCustomer(String[] customerSids,String orgCode) {
+ public ResultBean sendFinCustomer(String[] customerSids, String orgCode) {
ResultBean rb = ResultBean.fireFail();
List bdCustomers = new ArrayList<>();
for (String customerSid : customerSids) {
@@ -1019,9 +1024,9 @@ public class CrmCustomerTempService extends MybatisBaseService selectDetailss(String businessSid);
+
/* @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean> listPage(@RequestBody PagerQuery pq);
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java
index 6635ad512b..2322d0702f 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java
@@ -30,6 +30,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
return null;
}
+ @Override
+ public ResultBean selectDetailss(String businessSid) {
+ return null;
+ }
+
/* @Override
public ResultBean> listPage(PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
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 c231a5b4a1..6cdcdc8b42 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
@@ -19,7 +19,7 @@ public class SolutionsDetailsVo implements Vo {
private boolean finPlanState;
//金融方案主表
-
+
@ApiModelProperty("类型:01自营非担保,02外部金融")
private String type;
@ApiModelProperty("类型:01自营非担保,02外部金融")
@@ -63,6 +63,18 @@ public class SolutionsDetailsVo implements Vo {
private String loanPayMoney;
@ApiModelProperty("贷款利息")
private String loanInterest;
+ @ApiModelProperty("是否有融资票据")
+ private boolean accessoriesAmountCb;
+ @ApiModelProperty("是否有挂车")
+ private boolean trailerAmountCb;
+ @ApiModelProperty("是否有购置税")
+ private boolean purchaseTaxCb;
+ @ApiModelProperty("是否有保险")
+ private boolean premiumCb;
+ @ApiModelProperty("是否有车损上浮")
+ private boolean vehDamageFloatCb;
+ @ApiModelProperty("是否勾选其它融")
+ private boolean otherPolicyState;
//其他融
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 a823a5d07a..3c5d403116 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
@@ -15,10 +15,14 @@ public class SolutionsDto implements Dto {
//金融方案主表
+ @ApiModelProperty("销售订单sid")
private String saleOrderSid;
+ @ApiModelProperty("类型:01自营非担保,02外部金融")
private String type;
+ @ApiModelProperty("类型:01自营非担保,02外部金融")
private String typeKey;
- private Integer isPack;
+ @ApiModelProperty("是否打包:1是0否")
+ private String isPack;
@ApiModelProperty("产品政策名称")
private String policyName;
@ApiModelProperty("主车发票价")
@@ -36,6 +40,17 @@ public class SolutionsDto implements Dto {
@ApiModelProperty("融资项目总额")
private String loanTotal;
+ @ApiModelProperty("是否有融资票据")
+ private boolean accessoriesAmountCb;
+ @ApiModelProperty("是否有挂车")
+ private boolean trailerAmountCb;
+ @ApiModelProperty("是否有购置税")
+ private boolean purchaseTaxCb;
+ @ApiModelProperty("是否有保险")
+ private boolean premiumCb;
+ @ApiModelProperty("是否有车损上浮")
+ private boolean vehDamageFloatCb;
+
@ApiModelProperty("首付款比例")
private String downPayRatio;
@ApiModelProperty("首付金额")
@@ -43,7 +58,7 @@ public class SolutionsDto implements Dto {
@ApiModelProperty("贷款金额")
private String loanAmount;
@ApiModelProperty("贷款期数")
- private int loanPeriod;
+ private String loanPeriod;
@ApiModelProperty("贷款保证金比例")
private String bondRatio;
@ApiModelProperty("贷款保证金金额")
@@ -56,37 +71,38 @@ public class SolutionsDto implements Dto {
private String loanPayMoney;
@ApiModelProperty("利息总额")
private String loanInterest;
+ @ApiModelProperty("是否勾选其它融")
+ private boolean otherPolicyState;
//其他融
-
@ApiModelProperty("其它融名称")
private String otherPolicyName;
@ApiModelProperty("其它融贷款金额")
private String otherPolicyAmount;
@ApiModelProperty("其它融期数")
- private Integer otherPolicyPeriod;
+ private String otherPolicyPeriod;
@ApiModelProperty("其它融月还")
private String otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额")
private String otherPolicyInterest;
- /* @ApiModelProperty("'融资首付")
+ @ApiModelProperty("'融资首付")
private String loanDownPay;
@ApiModelProperty("总贷款金额")
private String loanAmountTotal;
@ApiModelProperty("期数")
- private Integer period;
+ private String period;
@ApiModelProperty("月还金额")
private String monthlyRepay;
@ApiModelProperty("利息总额")
- private String interest;*/
+ private String interest;
@ApiModelProperty("预计首期还款日")
private String returnTime;
//金融方案费用明细
- /* @ApiModelProperty("融资首付")
- private String downPayAmounts;*/
+ @ApiModelProperty("融资首付")
+ private String downPayAmounts;
@ApiModelProperty("贷款保证金")
private String bondAmounts;
@ApiModelProperty("保险保证金")
@@ -117,8 +133,8 @@ public class SolutionsDto implements Dto {
private String offsetPremium;
@ApiModelProperty("抵顶购置税")
private String offsetPurchasetax;
- /* @ApiModelProperty("抵顶费用合计")
- private String offsetTotal;*/
+ @ApiModelProperty("抵顶费用合计")
+ private String offsetTotal;
@ApiModelProperty("应收合计")
private String receivableTotal;
@ApiModelProperty("实收合计")
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
index c9de4a0ad2..6af43b7ccd 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
@@ -32,7 +32,7 @@ public class LoanSolutionsDetail extends BaseEntity {
@ApiModelProperty("融资首付")
private BigDecimal downPayAmount;
@ApiModelProperty("贷款保证金")
- private BigDecimal bondAmount;
+ private BigDecimal bondAmounts;
@ApiModelProperty("保险保证金")
private BigDecimal depositPremium;
@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 c02aea9d1a..0fdaf66832 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
@@ -59,7 +59,7 @@ public class LoanSolutionsOtherpolicy extends BaseEntity {
@ApiModelProperty("其它融金额")
private BigDecimal otherPolicyAmount;
@ApiModelProperty("其它融期数")
- private Integer otherPolicyPeriod;
+ private String otherPolicyPeriod;
@ApiModelProperty("其它融月还")
private BigDecimal otherPolicyMonthlyRepay;
@ApiModelProperty("其它融利息总额")
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java
index 635205dccd..7a29a9ece5 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java
@@ -40,6 +40,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
return loanSolutionsService.saveDto(dto);
}
+ @Override
+ public ResultBean selectDetailss(String businessSid) {
+ return loanSolutionsService.selectDetailss(businessSid);
+ }
+
/* @Override
public ResultBean> listPage(@RequestBody PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index a6ea042a30..88b71c7f39 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -46,16 +46,16 @@ public class LoanSolutionsService extends MybatisBaseService rb = ResultBean.fireFail();
SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo();
LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(saleOrderSid);
- if(loanSolutions != null){
+ if (loanSolutions != null) {
BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
//查询其它融以及金融费用明细是否存在
LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid());
- if(loanSolutionsOtherpolicy != null){
- BeanUtil.copyProperties(loanSolutionsOtherpolicy,solutionsDetailsVo);
+ if (loanSolutionsOtherpolicy != null) {
+ BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionsDetailsVo);
}
LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid());
- if(loanSolutionsDetail != null){
- BeanUtil.copyProperties(loanSolutionsDetail,solutionsDetailsVo);
+ if (loanSolutionsDetail != null) {
+ BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
}
}
//根据销售订单sid查询销售订单的信息
@@ -65,10 +65,10 @@ public class LoanSolutionsService extends MybatisBaseService selectDetailss(String businessSid) {
+ ResultBean rb = ResultBean.fireFail();
+ SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo();
+ LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(businessSid);
+ if (loanSolutions == null) {
+ return rb;
+ }
+ BeanUtil.copyProperties(loanSolutions, solutionsDetailsVo);
+ return rb.success().setData(solutionsDetailsVo);
+ }
/* @Autowired
private LoanSolutionsTopService loanSolutionsTopService;
@Autowired
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
index 99c3730e23..805d68585b 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
@@ -21,7 +21,7 @@ public class AppSolutionsDetailsVo implements Vo {
private String type;
private String typeKey;
@ApiModelProperty("是否打包,0不打包,1打包")
- private Integer isPack;
+ private String isPack;
@ApiModelProperty("产品政策名称")
private String policyName;
@ApiModelProperty("主车发票价")
@@ -39,6 +39,19 @@ public class AppSolutionsDetailsVo implements Vo {
@ApiModelProperty("融资项目总额")
private String loanTotal;
+ @ApiModelProperty("是否有融资票据")
+ private boolean accessoriesAmountCb;
+ @ApiModelProperty("是否有挂车")
+ private boolean trailerAmountCb;
+ @ApiModelProperty("是否有购置税")
+ private boolean purchaseTaxCb;
+ @ApiModelProperty("是否有保险")
+ private boolean premiumCb;
+ @ApiModelProperty("是否有车损上浮")
+ private boolean vehDamageFloatCb;
+ @ApiModelProperty("是否勾选其它融")
+ private boolean otherPolicyState;
+
@ApiModelProperty("首付款比例")
private String downPayRatio;
@ApiModelProperty("首付金额")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
index 3208d6cc74..b2483107a6 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
@@ -18,7 +18,7 @@ public class AppSolutionsDto implements Dto {
private String type;
private String typeKey;
@ApiModelProperty("是否打包,0不打包,1打包")
- private Integer isPack;
+ private String isPack;
@ApiModelProperty("产品政策名称")
private String policyName;
@ApiModelProperty("主车发票价")
@@ -35,6 +35,18 @@ public class AppSolutionsDto implements Dto {
private String vehDamageFloat;
@ApiModelProperty("融资项目总额")
private String loanTotal;
+ @ApiModelProperty("是否有融资票据")
+ private boolean accessoriesAmountCb;
+ @ApiModelProperty("是否有挂车")
+ private boolean trailerAmountCb;
+ @ApiModelProperty("是否有购置税")
+ private boolean purchaseTaxCb;
+ @ApiModelProperty("是否有保险")
+ private boolean premiumCb;
+ @ApiModelProperty("是否有车损上浮")
+ private boolean vehDamageFloatCb;
+ @ApiModelProperty("是否勾选其它融")
+ private boolean otherPolicyState;
@ApiModelProperty("首付款比例")
private String downPayRatio;
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java
index 8b497887d7..c2f3ec9cee 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java
@@ -4,6 +4,7 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -26,7 +27,7 @@ public interface SolutionsFeign {
ResultBean save(@RequestBody AppSolutionsDto dto);
@ApiOperation("初始化金融方案")
- @PostMapping("/selectDetailsVo")
+ @GetMapping("/selectDetailsVo")
ResultBean selectDetailsVo(@RequestParam("saleOrderSid") String saleOrderSid);
diff --git a/doc/databases/risk_center.sql b/doc/databases/risk_center.sql
index 71e2744e1a..c8d39a7219 100644
--- a/doc/databases/risk_center.sql
+++ b/doc/databases/risk_center.sql
@@ -899,40 +899,47 @@ CREATE TABLE `loan_solutions_top`
DROP TABLE IF EXISTS `loan_solutions`;
CREATE TABLE `loan_solutions`
(
- `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
- `sid` varchar(64) NOT NULL COMMENT 'sid',
- `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
- `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
- `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
- `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
- `state` int(32) DEFAULT '1' COMMENT '状态',
- `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
- `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
- `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
- `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
- `salesOrderSid` VARCHAR(64) DEFAULT NULL COMMENT '销售订单sid',
- `type` VARCHAR(64) DEFAULT NULL COMMENT '类型',
- `typeKey` VARCHAR(64) DEFAULT NULL COMMENT '类型key',
- `isPack` int(32) DEFAULT NULL COMMENT '是否打包',
- `policyName` varchar(255) DEFAULT NULL COMMENT '产品政策',
- `policySid` varchar(64) DEFAULT NULL COMMENT '产品政策sid',
- `loanTotal` decimal(10, 2) DEFAULT NULL COMMENT '融资项目总额',
- `mainVehicleAmount` decimal(10, 2) DEFAULT NULL COMMENT '主车发票价',
- `accessoriesAmount` decimal(10, 2) DEFAULT NULL COMMENT '融资票据',
- `trailerAmount` decimal(10, 2) DEFAULT NULL COMMENT '挂车金额',
- `purchaseTax` decimal(10, 2) DEFAULT NULL COMMENT '购置税',
- `premium` decimal(10, 2) DEFAULT NULL COMMENT '保险金额',
- `vehDamageFloat` decimal(10, 2) DEFAULT NULL COMMENT '车损上浮',
- `downPayRatio` varchar(100) DEFAULT NULL COMMENT '首付款比例',
- `downPayAmount` decimal(10, 2) DEFAULT NULL COMMENT '首付金额',
- `loanAmount` decimal(10, 2) DEFAULT NULL COMMENT '贷款金额',
- `loanPeriod` int(10) DEFAULT NULL COMMENT '贷款期数',
- `bondRatio` varchar(100) DEFAULT NULL COMMENT '保证金比例(%)',
- `bondAmount` decimal(10, 2) DEFAULT NULL COMMENT '保证金金额',
- `factoryDiscount` decimal(10, 2) DEFAULT NULL COMMENT '厂家贴息',
- `policyYearRatio` decimal(10, 3) DEFAULT NULL COMMENT '政策年利率(%)',
- `loanPayMoney` decimal(10, 2) DEFAULT NULL COMMENT '贷款月还',
- `loanInterest` decimal(10, 2) DEFAULT NULL COMMENT '贷款利息',
+ `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `sid` varchar(64) NOT NULL COMMENT 'sid',
+ `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
+ `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+ `isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
+ `state` int(32) DEFAULT '1' COMMENT '状态',
+ `isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
+ `remarks` varchar(255) DEFAULT NULL COMMENT '备注',
+ `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
+ `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
+ `salesOrderSid` VARCHAR(64) DEFAULT NULL COMMENT '销售订单sid',
+ `type` VARCHAR(64) DEFAULT NULL COMMENT '类型',
+ `typeKey` VARCHAR(64) DEFAULT NULL COMMENT '类型key',
+ `isPack` varchar(64) DEFAULT NULL COMMENT '是否打包',
+ `policyName` varchar(255) DEFAULT NULL COMMENT '产品政策',
+ `policySid` varchar(64) DEFAULT NULL COMMENT '产品政策sid',
+ `loanTotal` decimal(10, 2) DEFAULT NULL COMMENT '融资项目总额',
+ `mainVehicleAmount` decimal(10, 2) DEFAULT NULL COMMENT '主车发票价',
+ `accessoriesAmount` decimal(10, 2) DEFAULT NULL COMMENT '融资票据',
+ `trailerAmount` decimal(10, 2) DEFAULT NULL COMMENT '挂车金额',
+ `purchaseTax` decimal(10, 2) DEFAULT NULL COMMENT '购置税',
+ `premium` decimal(10, 2) DEFAULT NULL COMMENT '保险金额',
+ `vehDamageFloat` decimal(10, 2) DEFAULT NULL COMMENT '车损上浮',
+ `downPayRatio` varchar(200) DEFAULT NULL COMMENT '首付款比例',
+ `downPayAmount` decimal(10, 2) DEFAULT NULL COMMENT '首付金额',
+ `loanAmount` decimal(10, 2) DEFAULT NULL COMMENT '贷款金额',
+ `loanPeriod` varchar(32) DEFAULT NULL COMMENT '贷款期数',
+ `bondRatio` varchar(100) DEFAULT NULL COMMENT '保证金比例(%)',
+ `bondAmount` decimal(10, 2) DEFAULT NULL COMMENT '保证金金额',
+ `factoryDiscount` decimal(10, 2) DEFAULT NULL COMMENT '厂家贴息',
+ `policyYearRatio` decimal(10, 3) DEFAULT NULL COMMENT '政策年利率(%)',
+ `loanPayMoney` decimal(10, 2) DEFAULT NULL COMMENT '贷款月还',
+ `loanInterest` decimal(10, 2) DEFAULT NULL COMMENT '贷款利息',
+ `accessoriesAmountCb` int(10) DEFAULT NULL COMMENT '是否有融资票据:0否,1是',
+ `trailerAmountCb` int(10) DEFAULT NULL COMMENT '是否有挂车:0否,1是',
+ `purchaseTaxCb` int(10) DEFAULT NULL COMMENT '是否有购置税:0否,1是',
+ `premiumCb` int(10) DEFAULT NULL COMMENT '是否有保险:0否,1是',
+ `vehDamageFloatCb` int(10) DEFAULT NULL COMMENT '是否有车损上浮:0否,1是',
+ `otherPolicyState` int(10) DEFAULT NULL COMMENT '是否有其它融:0否,1是',
+
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
@@ -961,7 +968,7 @@ CREATE TABLE `loan_solutions_otherPolicy`
`otherPolicyInterest` decimal(10, 2) DEFAULT NULL COMMENT '其它融利息总额',
`loanDownPay` decimal(10, 2) DEFAULT NULL COMMENT '融资首付',
`loanAmountTotal` decimal(10, 2) DEFAULT NULL COMMENT '总贷款金额',
- `period` varchar(64) DEFAULT NULL COMMENT '期数',
+ `period` varchar(64) DEFAULT NULL COMMENT '期数',
`monthlyRepay` decimal(10, 2) DEFAULT NULL COMMENT '月还金额',
`interest` decimal(10, 2) DEFAULT NULL COMMENT '利息总额',
`returnTime` varchar(64) DEFAULT NULL COMMENT '预计首期还款日',