From f76e2c78d1ab0463cdcba47a618dc6d2a5c9b3a7 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 13 Sep 2023 18:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E8=B4=B7=E6=AC=BE=E4=BA=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=8A=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleOrders/AppBusSalesOrderFeign.java | 10 +++- .../AppBusSalesOrderFeignFallback.java | 5 ++ .../saleOrders/LoanPreloansQuery.java | 29 ++++++++++ .../saleOrders/LoanPreloansVo.java | 40 +++++++++++++ .../terminal/api/base/common/CommonFeign.java | 10 ++++ .../saleOrders/AppBusSalesOrderRest.java | 11 +++- .../saleOrders/AppBusSalesOrderService.java | 34 ++++++++++- .../terminal/biz/base/common/CommonRest.java | 10 ++++ .../biz/base/common/CommonService.java | 57 +++++++++++++++++++ 9 files changed, 198 insertions(+), 8 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java 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 319792c3ed..81c87e7aa7 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 @@ -338,16 +338,20 @@ public interface AppBusSalesOrderFeign { @ApiOperation("保存销售订单贷款人数量") @PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}") @ResponseBody - ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid,@PathVariable("num")String num); + ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid, @PathVariable("num") String num); @ApiOperation("保存销售订单贷款人自己") @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}") @ResponseBody - ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid")String saleOrderSid); + ResultBean saleOrderInputLenderOwn(@PathVariable("saleOrderSid") String saleOrderSid); @ApiOperation("保存销售订单贷款人") @PostMapping("/save/saleOrderInputLender/{saleOrderSid}/{sid}") @ResponseBody - ResultBean saleOrderInputLender(@PathVariable("saleOrderSid")String saleOrderSid,@PathVariable("sid")String sid); + ResultBean saleOrderInputLender(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("sid") String sid); + @ApiOperation("确定贷款人分页列表") + @PostMapping("/getPreLoanList") + @ResponseBody + ResultBean> getPreLoanList(@RequestBody PagerQuery pagerQuery); } \ 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 e473aa4ecb..0d95e37add 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 @@ -315,4 +315,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean saleOrderInputLender(String saleOrderSid, String sid) { return null; } + + @Override + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + 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/LoanPreloansQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java new file mode 100644 index 0000000000..fcbcf0aaa2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/13 + **/ +@Data +public class LoanPreloansQuery implements Query { + private static final long serialVersionUID = 4677306476460284056L; + + @ApiModelProperty("姓名") + private String custName; + @ApiModelProperty("身份证号码") + private String idCard; + @ApiModelProperty("手机号码") + private String phone; + @ApiModelProperty("用户sid,即销售专员的用户sid") + private String userSid; + + @ApiModelProperty("移动端：姓名、身份证、手机号") + private String name; + @ApiModelProperty("销售订单sid") + private String orderSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java new file mode 100644 index 0000000000..afa7447573 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/LoanPreloansVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders; + +import com.yxt.anrui.terminal.api.base.common.CarModelVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/13 + **/ +@Data +public class LoanPreloansVo implements Vo { + private static final long serialVersionUID = -6577382635622047300L; + + @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; + + private String sid; + + @ApiModelProperty("页面地址") + private CarModelVo pluginPage; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index cc317a0dc1..32890bf777 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -68,4 +68,14 @@ public interface CommonFeign { @GetMapping("/getLoanSs") ResultBean getLoanSs(@RequestParam("orderSid") String orderSid); + + @ApiOperation(value = "信用审核新增页面") + @ResponseBody + @GetMapping("/getInsertPreloan") + ResultBean getInsertPreloan(@RequestParam("customerTypeKey") String customerTypeKey,@RequestParam("customerTypeValue")String customerTypeValue); + + @ApiOperation(value = "信用审核详情页面") + @ResponseBody + @GetMapping("/getDetailsPreloan") + ResultBean getDetailsPreloan(@RequestParam("sid") String sid); } 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 75abf8c68a..d025bc4552 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 @@ -25,9 +25,9 @@ *********************************************************/ 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.InputLenderVo; -import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.*; 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; @@ -409,4 +409,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.saleOrderInputLender(saleOrderSid,sid); } + @Override + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + return appBusSalesOrderService.getPreLoanList(pagerQuery); + } + } 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 6219f02ff7..0e8adf84e6 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 @@ -27,6 +27,8 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanQuery; +import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo; import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; @@ -71,13 +73,19 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceV import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; +import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; 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.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery; +import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansQuery; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansVo; 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; @@ -168,6 +176,8 @@ public class AppBusSalesOrderService { private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign; @Autowired private CommonService commonService; + @Autowired + private AppSubsetVersionFeign appSubsetVersionFeign; /************************************* 销售订单接口 *********************************************/ @@ -767,7 +777,7 @@ public class AppBusSalesOrderService { } public ResultBean saleOrderInputLenderNum(String sid, String num) { - return busSalesOrderFeign.saveBorrowNum(sid,num); + return busSalesOrderFeign.saveBorrowNum(sid, num); } public ResultBean saleOrderInputLenderOwn(String saleOrderSid) { @@ -777,9 +787,29 @@ public class AppBusSalesOrderService { public ResultBean saleOrderInputLender(String saleOrderSid, String sid) { ResultBean rb = ResultBean.fireFail(); InputLenderVo inputLenderVo = new InputLenderVo(); - ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid,sid); + ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputLender(saleOrderSid, sid); SalesLenderVo vinVo = resultBean.getData(); BeanUtil.copyProperties(vinVo, inputLenderVo); return rb.success().setData(inputLenderVo); } + + public ResultBean> getPreLoanList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); + ResultBean> resultBean = loanPreloanCreditApplyFeign.getOrderLoanPagerList(pq); + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList()); + PagerVo v = new PagerVo<>(); + BeanUtil.copyProperties(resultBean.getData(), v); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.DetailCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + for (int i = 0; i < voList.size(); i++) { + LoanPreloansVo loanPreloansVo = voList.get(i); + CarModelVo finPage1 = commonService.getDetailsPreloan(loanPreloansVo.getSid(), appSubVersionVo).getData(); + loanPreloansVo.setPluginPage(finPage1); + } + v.setRecords(voList); + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 0d894b5d8b..610277a0f3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -68,4 +68,14 @@ public class CommonRest implements CommonFeign { public ResultBean getLoanSs(String orderSid) { return commonService.getLoanSs(orderSid); } + + @Override + public ResultBean getInsertPreloan(String customerTypeKey, String customerTypeValue) { + return commonService.getInsertPreloan(customerTypeKey,customerTypeValue); + } + + @Override + public ResultBean getDetailsPreloan(String sid) { + return commonService.getDetailsPreloan(sid,null); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index ab6189cc14..10532d3f46 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -199,4 +199,61 @@ public class CommonService { carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } + + public ResultBean getInsertPreloan(String customerTypeKey, String customerTypeValue) { + ResultBean rb = ResultBean.fireFail(); + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.EditCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + AppSubVersionVo appSubVersionVo = voResultBean.getData(); + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("creditType", 0); + map.put("createSource", 0); + map.put("customerTypeKey", customerTypeKey); + map.put("customerTypeValue", customerTypeValue); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1004"); + carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager"); + carModelVo.setARouterMethod("EDIT_CREDIT_REVIEW_ACTIVITY"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("INT"); + aRouterParamType.add("INT"); + aRouterParamType.add("STRING"); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add("0"); + aRouterParamValue.add("0"); + aRouterParamValue.add(customerTypeKey); + aRouterParamValue.add(customerTypeValue); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + return rb.success().setData(carModelVo); + } + + public ResultBean getDetailsPreloan(String sid,AppSubVersionVo appSubVersionVo) { + ResultBean rb = ResultBean.fireFail(); + if(appSubVersionVo != null){ + String appSid = "fec4e243-491a-11ec-94cd-fa163e0cb33c"; + String moduleAction = "com.anrui.android.plugin.riskcontrol.activity.DetailCreditReviewActivity"; + ResultBean voResultBean = appSubsetVersionFeign.getLastRiskByAppSid(appSid, moduleAction); + appSubVersionVo = voResultBean.getData(); + } + CarModelVo carModelVo = new CarModelVo(); + Map map = new HashMap<>(); + map.put("sid", sid); + appSubVersionVo.setJson(JSONObject.toJSONString(map)); + BeanUtil.copyProperties(appSubVersionVo, carModelVo); + carModelVo.setRequestCode("1006"); + carModelVo.setARouterClass("com.anrui.android.plugin.riskcontrol.manager.ARouterManager"); + carModelVo.setARouterMethod("DETAIL_CREDIT_REVIEW_ACTIVITY"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(sid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); + return rb.success().setData(carModelVo); + } }