From f64ac61b7bb569759685f9f45ab305c191d9f686 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 14 Sep 2023 12:04:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 4 ++++ .../loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml | 6 ++++-- .../LoanPreloanCreditApplyService.java | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) 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/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)); From 58a0ec5b270c48469ec3822ae577b8f71e440b05 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 14 Sep 2023 12:12:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleOrders/AppBusSalesOrderService.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) 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 From e11d11e6d4e0a3323aea01e58b89f450d0643089 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 14 Sep 2023 14:12:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loancreditappealapply/LoanCreditAppealApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 751a2b7285..901e16b25c 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 @@ -306,7 +306,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService data = commonAppendixFeign.selByLinkSid(sid).getData(); List ssImages = new ArrayList<>(); for (CommonAppendixVo datum : data) { - ssImages.add(datum.getFilePath()); + ssImages.add(datum.getFileUrl()); } vo.setSsImages(ssImages); return rb.success().setData(vo);