diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java index c5481617a9..543aa92b2e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppVinListVo.java @@ -16,4 +16,15 @@ public class AppVinListVo implements Vo { private String busVinSid; @ApiModelProperty("业务状态") private String businessState; + + @ApiModelProperty("资方放款审核结果") + private String bankStateValue; + @ApiModelProperty("资方放款审核结果key") + private String bankStateKey; + @ApiModelProperty("资料是否齐全") + private String zlStateValue; + @ApiModelProperty("资料是否齐全：0未齐全/1已齐全") + private String zlState; + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java index aa7d4fcc45..a5b5dab460 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java @@ -50,12 +50,9 @@ import lombok.Data; public class BusDeliveredVo implements Vo { private static final long serialVersionUID = -9212919952192716940L; -// private String sid; - @ApiModelProperty("业务状态") private String subscription; - /* @ApiModelProperty("业务状态key") - private String subscriptionKey;*/ + @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户名称") @@ -68,32 +65,15 @@ public class BusDeliveredVo implements Vo { private String vinSid; @ApiModelProperty("销售类型") private String paymentMethod; - /* @ApiModelProperty(value = "联系电话") - private String mobile; - @ApiModelProperty(value = "证件号码") - private String idNo; - @ApiModelProperty(value = "联系地址") - private String address; - @ApiModelProperty(value = "车型别名") - private String modelName; - @ApiModelProperty(value = "成交价") - private String price; - - @ApiModelProperty("销售类型") - private String paymentMethod; - @ApiModelProperty("销售类型key") - private String paymentMethodKey; - @ApiModelProperty("返利人1") - private String distributorName; - @ApiModelProperty("返利金额1") - private String distributorPrice; - @ApiModelProperty("返利人2") - private String distributorNameTwo; - @ApiModelProperty("返利金额2") - private String distributorPriceTwo; - @ApiModelProperty("销售折让") - private String singleCarDiscountPrice;*/ + @ApiModelProperty("资方放款审核结果") + private String bankStateValue; + @ApiModelProperty("资方放款审核结果key") + private String bankStateKey; + @ApiModelProperty("资料是否齐全") + private String zlStateValue; + @ApiModelProperty("资料是否齐全：0未齐全/1已齐全") + private String zlState; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index bd45f5ecf1..9cc84d2650 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -87,39 +87,6 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - /** - * 提交 - * - * @param dto - * @return - */ - /* @ApiOperation("提交") - @PostMapping("/submit") - @ResponseBody - ResultBean submit(@RequestBody BusDeliveredApplyDto dto);*/ - - /** - * 列表上的提交 - * - * @param sid 出库申请sid - * @return - */ -/* @ApiOperation("列表上的提交") - @PutMapping("/submitBySid") -// @ResponseBody - ResultBean submitBySid(@RequestParam(value = "sid") String sid);*/ - - /** - * 列表上的撤回 - * - * @param sid 出库申请sid - * @return - */ - /* @ApiOperation("列表上的撤回") - @PutMapping("/revokeBySid") - @ResponseBody - ResultBean revokeBySid(@RequestParam(value = "sid") String sid);*/ - /** * 编辑初始化/详情 * @@ -136,29 +103,11 @@ public interface BusDeliveredApplyFeign { @ResponseBody ResultBean fetchBySid(@RequestParam("sid") String sid); - /* @ApiOperation("验证是否可出库") - @PostMapping("/checkingApply") -// @ResponseBody - @ApiIgnore - public ResultBean checkingApply(@RequestBody CheckingApplyQuery query); - - @ApiOperation("审批") -// @ResponseBody - @PostMapping(value = "examine") - @ApiIgnore - ResultBean examine(@RequestBody BusDeExamineQuery busDeExamineQuery);*/ - @ApiOperation("出库审核分页列表") @PostMapping("/listExaminePage") @ResponseBody public ResultBean> listExaminePage(@RequestBody PagerQuery pq); - /* @ApiOperation("提交出库审批流程") - @PostMapping("/submitDeliveredApply") - @ResponseBody - public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);*/ - - @ApiOperation(value = "办理（同意）") @PostMapping("/complete") @ResponseBody @@ -192,18 +141,12 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean> getRetrievalApplyList(@RequestBody PagerQuery pagerQuery); - /* @ApiOperation("手机端-初始化 出库申请") - @GetMapping("/getRetrievalApplyInfoBySid/{sid}") - @ResponseBody - public ResultBean getRetrievalApplyInfoBySid(@PathVariable("sid") String sid); - */ /***************************************APP******************************************/ @ApiOperation("手机端-初始化 出库申请") @GetMapping("/getRetrievalApplyInfoBySid") @ResponseBody -// public ResultBean getRetrievalApplyInfoBySid(@RequestParam("sid") String sid); public ResultBean getRetrievalApplyInfoBySid(@RequestParam("sid") String sid); @ApiOperation("手机端-保存 出库申请") @@ -231,6 +174,7 @@ public interface BusDeliveredApplyFeign { @ResponseBody ResultBean deliveredFinSelectByBusVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); + /*******************************************欠款出库相关****************************************************/ @ApiOperation("欠款出库申请分页列表") @PostMapping("/unListPage") @ResponseBody @@ -241,4 +185,9 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean unSave(@RequestBody UnBusDeliveredApplyDto dto); + @ApiOperation("提交欠款出库审批流程") + @PostMapping("/submitUnDeliveredApply") + @ResponseBody + public ResultBean submitUnDeliveredApply(@Valid @RequestBody SubmitUnDeliveredApplyDto dto); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index c2a7e4a4d4..b0f55cb123 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -141,6 +141,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean submitUnDeliveredApply(SubmitUnDeliveredApplyDto dto) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitUnDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitUnDeliveredApplyDto.java new file mode 100644 index 0000000000..6bfa2badaa --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitUnDeliveredApplyDto.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/10/9 + **/ +@Data +public class SubmitUnDeliveredApplyDto extends UnBusDeliveredApplyDto { + + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java index 3f10cca241..6256d94cb1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/UnBusDeliveredApplyDto.java @@ -1,9 +1,11 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; +import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -14,54 +16,65 @@ import java.util.List; @Data public class UnBusDeliveredApplyDto { - @ApiModelProperty(value = "出库申请sid") - private String sid; - private String userSid; - @ApiModelProperty("发起部门sid") - private String applyDeptSid; - @ApiModelProperty("发起部门") - private String applyDept; - @ApiModelProperty("发起人sid") - private String applySid; - @ApiModelProperty("发起人") - private String applyName; - @ApiModelProperty("销售部门sid") - private String staffDeptSid; + @ApiModelProperty("合同编号") + private String contractId; + //销售类型 + private String paymentMethod; + private String paymentMethodKey; @ApiModelProperty("销售部门") + private String staffDeptSid; private String staffDeptName; - @ApiModelProperty("销售专员用户sid") private String staffUserSid; @ApiModelProperty("销售专员") private String staffName; - @ApiModelProperty("销售类型key") - private String paymentMethodKey; - @ApiModelProperty("销售类型") - private String paymentMethod; - @ApiModelProperty("合同编号") - private String contractNo; + @ApiModelProperty("发起日期") + private String createTime; + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("客户名称") private String name; - @ApiModelProperty("客户手机号") + @ApiModelProperty("客户电话") private String mobile; - @ApiModelProperty("车型别名") + @ApiModelProperty("车型名称") private String modelName; + @ApiModelProperty("单车中介人1") + private String distributorName; + @ApiModelProperty("单车中介人2") + private String distributorNameTwo; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + @ApiModelProperty("主车成交价") + private String price; + @ApiModelProperty("购车人类型key") + private String typeKey; + @ApiModelProperty("购车人类型值") + private String type; @ApiModelProperty("贷款人") private String loanName; - @ApiModelProperty("贷款人手机号") + @ApiModelProperty("贷款人sid") + private String loanSid; + @ApiModelProperty("贷款人电话") private String loanMobile; - @ApiModelProperty("实际购车人类型:0订单客户，1贷款人，2其他人") - private String type; - @ApiModelProperty(value = "出库申请的车辆信息") - private List detailsList; + @ApiModelProperty("总备注") + private String remarks; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("orgPath") private String orgPath; - @ApiModelProperty("成交价") - private String price; - @ApiModelProperty("返利人sid") - private String distributorName; - @ApiModelProperty("返利金额1") - private String distributorPrice; - @ApiModelProperty("返利人2sid") - private String distributorNameTwo; - @ApiModelProperty("返利金额2") - private String distributorPriceTwo; + + @ApiModelProperty("车辆集合") + private List carList; + + @ApiModelProperty("责任人担保承诺书") + private List promiseList = new ArrayList<>(); + + @ApiModelProperty("担保承诺书") + private List danFileList = new ArrayList<>(); + + @ApiModelProperty("车辆登记合同") + private List carFileList = new ArrayList<>(); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java index 009ed859af..12faf443ba 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/AppCarListVo.java @@ -23,5 +23,14 @@ public class AppCarListVo implements Vo { @ApiModelProperty("实际购车人") private BusDeliveredUseMessagesVo realBuyer; + @ApiModelProperty("资方放款审核结果") + private String bankStateValue; + @ApiModelProperty("资方放款审核结果key") + private String bankStateKey; + @ApiModelProperty("资料是否齐全") + private String zlStateValue; + @ApiModelProperty("资料是否齐全：0未齐全/1已齐全") + private String zlState; + } 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 e01a2b430e..696e91e569 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 @@ -62,6 +62,8 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; +import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -121,6 +123,8 @@ public class BusDeliveredService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectListsVoNew(page, qw); + List list = pagging.getRecords(); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (int i = 0; i < list.size(); i++) { + BusDeliveredVo busDeliveredVo = list.get(i); + String busVinSid = busDeliveredVo.getBusVinSid(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid); + if(busSalesOrderVehicle != null){ + String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid(); + String loanContractSid = busSalesOrderVehicle.getLoanContractSid(); + //根据消贷合同和销售订单查询 + ResultBean loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ + busDeliveredVo.setBankStateValue("未审核"); + busDeliveredVo.setZlStateValue("否"); + }else{ + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + busDeliveredVo.setZlStateValue("是"); + busDeliveredVo.setZlState(loanFileexamine.getZlState()); + }else{ + busDeliveredVo.setZlStateValue("否"); + busDeliveredVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + busDeliveredVo.setBankStateValue("未审核"); + }else{ + busDeliveredVo.setBankStateValue(loanFileexamine.getBankStateValue()); + busDeliveredVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } + } + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -276,6 +314,44 @@ public class BusDeliveredService extends MybatisBaseService iPage = baseMapper.getRetrievalNotListNew(page, qw, name); + List list = iPage.getRecords(); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (int i = 0; i < list.size(); i++) { + AppBusDeliveredPageVo busDeliveredVos = list.get(i); + List vinList = busDeliveredVos.getVinList(); + for (int j = 0; j < vinList.size(); j++) { + AppVinListVo appVinListVo = vinList.get(j); + String busVinSid = appVinListVo.getBusVinSid(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busVinSid); + if(busSalesOrderVehicle != null){ + String saleOrderSid = busSalesOrderVehicle.getSalesOrderSid(); + String loanContractSid = busSalesOrderVehicle.getLoanContractSid(); + //根据消贷合同和销售订单查询 + ResultBean loanFileexamineResultBean = loanFileexamineFeign.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(!loanFileexamineResultBean.getSuccess()){ + appVinListVo.setBankStateValue("未审核"); + appVinListVo.setZlStateValue("否"); + }else{ + LoanFileexamine loanFileexamine = loanFileexamineResultBean.getData(); + if("1".equals(loanFileexamine.getZlState())){ + appVinListVo.setZlStateValue("是"); + appVinListVo.setZlState(loanFileexamine.getZlState()); + }else{ + appVinListVo.setZlStateValue("否"); + appVinListVo.setZlState(loanFileexamine.getZlState()); + } + if(StringUtils.isBlank(loanFileexamine.getBankStateValue())){ + appVinListVo.setBankStateValue("未审核"); + }else{ + appVinListVo.setBankStateValue(loanFileexamine.getBankStateValue()); + appVinListVo.setBankStateKey(loanFileexamine.getBankStateKey()); + } + } + } + } + } + } return iPage; } @@ -438,6 +514,31 @@ 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.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index 2801e19d93..eb111036b1 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -104,6 +104,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper { List selectVinNo(@Param("contractId") String contractId, @Param("list") List vinSid); List selectVinNosss(@Param("contractId") String contractId, @Param("list") List vinSid); + List selectVinNosss2(@Param("contractId") String contractId, @Param("list") List vinSid); String selectNum(String billNo); @@ -114,6 +115,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper { int selectNumByContractNo(String contractId); List selectSid(@Param("contractId") String contractId,@Param("sid") String sid); + List selectSid2(@Param("contractId") String contractId,@Param("sid") String sid); List selectBySid(@Param("contractNo") String contractId, @Param("list") List vinNoLists); 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 b1cb9ade31..36380dbbab 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 @@ -125,6 +125,21 @@ + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java index bb0a94286c..7ec9b453f6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineRest.java @@ -99,4 +99,9 @@ public class LoanFileexamineRest implements LoanFileexamineFeign { loanFileexamineService.uploadFile(loanFileDto); return rb.success(); } + + @Override + public ResultBean selectOrderSidAndContract(String saleOrderSid, String loanContractSid) { + return loanFileexamineService.selectOrderSidAndContract(saleOrderSid,loanContractSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java index 57b2cbad2c..e06dd8e778 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfileexamine/LoanFileexamineService.java @@ -488,4 +488,17 @@ public class LoanFileexamineService extends MybatisBaseService selectOrderSidAndContract(String saleOrderSid, String loanContractSid) { + ResultBean rb = ResultBean.fireFail(); + //根据销售订单sid和消贷合同sid查询信息 + if(StringUtils.isBlank(loanContractSid)){ + return rb; + } + LoanFileexamine loanFileexamine = baseMapper.selectOrderSidAndContract(saleOrderSid,loanContractSid); + if(loanFileexamine == null){ + return rb; + } + return rb.success().setData(loanFileexamine); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java index 4f8b535b1d..f89ef749bc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/CarListVo.java @@ -21,4 +21,13 @@ public class CarListVo implements Vo { @ApiModelProperty("实际购车人") private DeliveredUseMessagesVo realBuyer; + + @ApiModelProperty("资方放款审核结果") + private String bankStateValue; + @ApiModelProperty("资方放款审核结果key") + private String bankStateKey; + @ApiModelProperty("资料是否齐全") + private String zlStateValue; + @ApiModelProperty("资料是否齐全：0未齐全/1已齐全") + private String zlState; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java index 75a20f8b04..517be2d3cf 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java @@ -17,4 +17,13 @@ public class VinListVo implements Vo { private String vinSid; @ApiModelProperty("销售订单车辆sid") private String busVinSid; + + @ApiModelProperty("资方放款审核结果") + private String bankStateValue; + @ApiModelProperty("资方放款审核结果key") + private String bankStateKey; + @ApiModelProperty("资料是否齐全") + private String zlStateValue; + @ApiModelProperty("资料是否齐全：0未齐全/1已齐全") + private String zlState; }