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 3a8758cef9..98b6ed1bec 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 @@ -794,6 +794,8 @@ public class BusDeliveredApplyService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("销售订单确定贷款人列表") + @PostMapping("/getOrderLoanPagerList") + @ResponseBody + ResultBean> getOrderLoanPagerList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("查询销售订单的客户是否已信用审核通过") + @GetMapping("/judgeIsLoan") + @ResponseBody + ResultBean judgeIsLoan(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java index eafff51a34..77892f9550 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeignFallback.java @@ -81,4 +81,14 @@ public class LoanPreloanCreditApplyFeignFallback implements LoanPreloanCreditApp ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loanpreloancreditapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean> getOrderLoanPagerList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean judgeIsLoan(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java new file mode 100644 index 0000000000..8e7a2ebd13 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.riskcenter.api.loanpreloancreditapply; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/6 + **/ +@Data +public class LoanPreloanQuery implements Query { + + private static final long serialVersionUID = 1488404237944732235L; + @ApiModelProperty("姓名") + private String custName; + @ApiModelProperty("身份证号码") + private String idCard; + @ApiModelProperty("手机号码") + private String phone; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java new file mode 100644 index 0000000000..d549865855 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.riskcenter.api.loanpreloancreditapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/6 + **/ +@Data +public class LoanPreloanVo implements Vo { + private static final long serialVersionUID = 6533662938784811105L; + @ApiModelProperty("客户sid") + private String custSid; + @ApiModelProperty("客户名称") + private String custName; + @ApiModelProperty("手机号码") + private String phone; + + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方名称") + private String capitalName; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("担保人") + private String peoName; + @ApiModelProperty("申请日期") + private String createTime; + + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java index 84ef247240..d02d3f81c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java @@ -73,4 +73,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 1ece50337d..8aa39528a7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -628,4 +628,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService getOrderLoanPagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + LoanPreloanCreditApply judgeIsLoan(String sid); + + LoanOrderPreloanVo judgeIsLoan2(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index 0d035509f0..add4b77070 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -20,4 +20,23 @@ ${ew.sqlSegment} + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java index af2a754010..230e9ed438 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loanpreloancreditapply; +import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVos; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -103,4 +104,16 @@ public class LoanPreloanCreditApplyRest implements LoanPreloanCreditApplyFeign { LoanPreloanCreditApplyDetailsVo vo = loanPreloanCreditApplyService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> getOrderLoanPagerList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanPreloanCreditApplyService.getOrderLoanPagerList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean judgeIsLoan(String sid) { + return loanPreloanCreditApplyService.judgeIsLoan(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index ee1be3a4d4..b1a10f3239 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -32,9 +32,14 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixSelectQuery; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply; import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*; import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo; import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuery; +import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo; +import com.yxt.anrui.riskcenter.biz.loancreditappealapply.LoanCreditAppealApplyService; import com.yxt.anrui.riskcenter.biz.loanpreloancreditpeo.LoanPreloanCreditPeoService; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -62,6 +67,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanPreloanCreditApplyQuery query = pq.getParams(); @@ -156,7 +163,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService getOrderLoanPagerList(PagerQuery pagerQuery) { + //查询销售专员本人的贷前贷款人 + //实际购车人为销售订单的客户, + LoanPreloanQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getOrderLoanPagerList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean judgeIsLoan(String sid) { + ResultBean rb = ResultBean.fireFail(); + //查询销售订单的实际购车人也就是客户是否已信用审核通过 + LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid); + LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid); + if (loanPreloanCreditApply == null) { + return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核"); + } else { + if (StringUtils.isNotBlank(loanPreloanCreditApply.getGsfkjgKey())) { + if (loanPreloanCreditApply.getState() != 2 && "001".equals(loanPreloanCreditApply.getGsfkjgKey())) { + return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中,请等待!"); + } else { + if ("002".equals(loanPreloanCreditApply.getGsfkjgKey())) { + //查询申诉是否通过,若无申诉,则直接提示未通过,若存在申诉,通过的,也算信用审核通过 + LoanCreditAppealApply loanCreditAppealApply = loanCreditAppealApplyService.selectByApplySid(loanPreloanCreditApply.getSid()); + if (loanCreditAppealApply != null) { + if ("已办结".equals(loanCreditAppealApply.getNodeState())) { + return rb.success(); + } else { + return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过!"); + } + } else { + return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过!"); + } + } else { + return rb.success(); + } + } + } else { + return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中,请等待!"); + } + } + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 93b671d8c7..fd54ff1d7d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -116,7 +116,7 @@ public interface AppBusSalesOrderFeign { @ApiOperation("重新发起") @GetMapping("rePublishSaleOrder") @ResponseBody - public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException; + public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "customerSid", required = false) String customerSid, @RequestParam(value = "customerName", required = false) String customerName, @RequestParam(value = "customerMobile", required = false) String customerMobile) throws InvocationTargetException, IllegalAccessException; /*-----------------------------------------车型信息------------------------------------------*/ @@ -318,5 +318,10 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto); + @ApiOperation("销售订单点击贷款人确定") + @GetMapping("/judgeIsLoan") + @ResponseBody + ResultBean judgeIsLoan(@RequestParam("sid")String sid); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index 3f8dbdd982..e1090ac477 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -283,4 +283,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) { return null; } + + @Override + public ResultBean judgeIsLoan(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/OrderLoanVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/OrderLoanVo.java new file mode 100644 index 0000000000..dc3e3bf2d1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/OrderLoanVo.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/6 + **/ +@Data +public class OrderLoanVo implements Vo { + private static final long serialVersionUID = 8982070126931423913L; + + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("台数") + private String quantity; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 81e73ea921..057b01d1e8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo; @@ -375,4 +376,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.agreeSaleOrderInfoBy(dto); } + @Override + public ResultBean judgeIsLoan(String sid) { + return appBusSalesOrderService.judgeIsLoan(sid); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 68e7716a53..4729cf6657 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -73,6 +73,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; 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.loanpreloancreditapply.LoanOrderPreloanVo; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; @@ -158,6 +161,8 @@ public class AppBusSalesOrderService { private BaseVehicleFeign baseVehicleFeign; @Autowired private BasePurchaseSystemFeign basePurchaseSystemFeign; + @Autowired + private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign; /************************************* 销售订单接口 *********************************************/ @@ -714,4 +719,16 @@ public class AppBusSalesOrderService { } return rb.success().setData(resultBean.getData()).setMsg(resultBean.getMsg()); } + + public ResultBean judgeIsLoan(String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = loanPreloanCreditApplyFeign.judgeIsLoan(sid); + if (!resultBean.getSuccess()) { + OrderLoanVo orderLoanVo = new OrderLoanVo(); + LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData(); + BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo); + return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo); + } + return rb.success(); + } } \ No newline at end of file