diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java index 3254df3601..6e36ba3bc9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java @@ -56,6 +56,7 @@ public class BusDeliveredApplyVo implements Vo { private String billNo; @ApiModelProperty("销售类型") private String paymentMethod; + private String paymentMethodKey; @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户名称") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 6e99a5de89..071e86642f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -565,6 +565,8 @@ public class BusDeliveredService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ + appCarListVo.setBankStateValue("未审核"); + appCarListVo.setZlStateValue("否"); + }else{ + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + appCarListVo.setZlStateValue("是"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + }else{ + appCarListVo.setZlStateValue("否"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + appCarListVo.setBankStateValue("未审核"); + }else{ + appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue()); + appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } + } + } carList.add(appCarListVo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 36380dbbab..b50cece31e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -16,6 +16,7 @@ bd.modelName, bd.billNo, bd.paymentMethod, + bd.paymentMethodKey, bd.createBySid, (select count(*) from bus_delivered_apply_details bad where bad.applySid = bd.sid) as num FROM bus_delivered_apply bd diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 2cfdbb6de5..d2f947e8c7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -141,6 +141,8 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; @@ -258,6 +260,8 @@ public class BusDeliveredApplyService extends MybatisBaseService loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ + appCarListVo.setBankStateValue("未审核"); + appCarListVo.setZlStateValue("否"); + }else{ + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + appCarListVo.setZlStateValue("是"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + }else{ + appCarListVo.setZlStateValue("否"); + appCarListVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + appCarListVo.setBankStateValue("未审核"); + }else{ + appCarListVo.setBankStateValue(loanFileexamine.getBankStateValue()); + appCarListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } + } + } + carList.add(appCarListVo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 4ff4c31925..40d450e2d1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -114,7 +114,7 @@