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 865253643a..8abb7ad5e8 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 @@ -7367,6 +7367,10 @@ public class BusSalesOrderService extends MybatisBaseService rb = ResultBean.fireFail(); SalesLenderVo salesLenderVo = new SalesLenderVo(); salesLenderVo.setSaleOrderSid(saleOrderSid); + BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.selectOrderSid(saleOrderSid); + if (busSalesOrderBorrower != null) { + return rb.setMsg("该客户已存在贷款人中"); + } //订单总台数 BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(saleOrderSid); //查询该销售订单已确定的数量 diff --git a/anrui-riskcenter-ui/src/views/capital/capital.vue b/anrui-riskcenter-ui/src/views/capital/capital.vue index ae9e76d8c1..520d7751a1 100644 --- a/anrui-riskcenter-ui/src/views/capital/capital.vue +++ b/anrui-riskcenter-ui/src/views/capital/capital.vue @@ -194,7 +194,7 @@ export default { getList() { this.listLoading = true this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') - this.listQuery.params.orhPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.listQuery.params.menuUrl = this.$route.path req.listPage(this.listQuery).then(response => { this.listLoading = false 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 1cdb72b01d..e8d7941860 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 @@ -22,7 +22,7 @@ \ No newline at end of file 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 978831f9ae..88bfe6e13a 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 @@ -568,6 +568,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService borrowSidList = baseMapper.selectBySid(query.getOrderSid()); borrowSidList.removeAll(Collections.singleton(null)); 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 0e8adf84e6..8e7eb00a5b 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 @@ -797,19 +797,26 @@ public class AppBusSalesOrderService { 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); + if(resultBean.getData() != null){ + List voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList()); + + 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); + }else{ + return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); } - v.setRecords(voList); - return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v); + + } } \ No newline at end of file