From de31bdf842d67359bac841523132c76a5a368f36 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Sat, 10 May 2025 20:54:38 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0a76720b64..94377bc4d4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4688,7 +4688,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService(1024), namedThreadFactory, new java.util.concurrent.ThreadPoolExecutor.AbortPolicy()); + FinCollectionConfirmation finalConfirmation1 = confirmation; + Future future1 = pool.submit(() -> { + pushToRiskToFin(finalConfirmation1, finSelectedReceivablesDetailedVos, collectionDate, voucher); + }); + } catch (Exception e) { + e.printStackTrace(); + } + //推送凭证业务 if (!generalVoucherDetails.isEmpty()) { generalVoucher.setVoucherDetails(generalVoucherDetails); @@ -4729,8 +4742,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Mon, 12 May 2025 08:34:51 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanredemptionapply/LoanRedemptionApplyService.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/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java index 3e9aea7fac..e4cc74efb5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java @@ -899,8 +899,8 @@ public class LoanRedemptionApplyService extends MybatisBaseService Date: Mon, 12 May 2025 09:47:26 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 94377bc4d4..41b1ef6e93 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4742,8 +4742,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Mon, 12 May 2025 10:34:59 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue | 2 +- .../src/views/secondarysublet/secondarysublet.vue | 2 +- .../src/views/surrenderforredemption/surrenderforredemption.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue index ee17b805d3..c33012304e 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysales.vue @@ -155,7 +155,7 @@
- +
diff --git a/anrui-riskcenter-ui/src/views/secondarysublet/secondarysublet.vue b/anrui-riskcenter-ui/src/views/secondarysublet/secondarysublet.vue index b257f35543..e84dd90c3e 100644 --- a/anrui-riskcenter-ui/src/views/secondarysublet/secondarysublet.vue +++ b/anrui-riskcenter-ui/src/views/secondarysublet/secondarysublet.vue @@ -200,7 +200,7 @@
- +
diff --git a/anrui-riskcenter-ui/src/views/surrenderforredemption/surrenderforredemption.vue b/anrui-riskcenter-ui/src/views/surrenderforredemption/surrenderforredemption.vue index 9264de8bca..39bd18cac2 100644 --- a/anrui-riskcenter-ui/src/views/surrenderforredemption/surrenderforredemption.vue +++ b/anrui-riskcenter-ui/src/views/surrenderforredemption/surrenderforredemption.vue @@ -192,7 +192,7 @@
- +
From 4fd2a6062808d2c8bbeab796eab57119a130731a Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 11:49:59 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppBusArrearsCarryVehicleApplyService.java | 22 +++++-------------- .../secondarysales/SecondarySalesService.java | 22 +++++-------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 41612f594c..a4ad509e3a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -279,24 +279,12 @@ public class AppBusArrearsCarryVehicleApplyService { GetNodeQuery getNodeQuery = new GetNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); String data = ""; - if (next == 0) { - ResultBean> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery); - if (getPreviousNodesForReject.getSuccess()) { - getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); - data = getPreviousNodesForReject.getData().get(0).getName(); - } else { - return rb.setMsg(getPreviousNodesForReject.getMsg()); - } - } else if (next == 1) { - ResultBean> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery); - if (getNextNodesForSubmit.getSuccess()) { - getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); - data = getNextNodesForSubmit.getData().get(0).getName(); - } else { - return rb.setMsg(getNextNodesForSubmit.getMsg()); - } + ResultBean> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); } else { - return rb.setMsg("参数错误：next"); + return rb.setMsg(getNextNodesForSubmit.getMsg()); } arrearsVo.setTitle(data); ResultBean details = details(query.getBusinessSid()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index e74c9f1e15..21b12e0bb4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -216,24 +216,12 @@ public class SecondarySalesService { LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); String data = ""; - if (next == 0) { - ResultBean> getPreviousNodesForReject = loanSecondarySalesApplyFeign.getPreviousNodesForReject(getNodeQuery); - if (getPreviousNodesForReject.getSuccess()) { - getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); - data = getPreviousNodesForReject.getData().get(0).getName(); - } else { - return rb.setMsg(getPreviousNodesForReject.getMsg()); - } - } else if (next == 1) { - ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getNextNodesForSubmit(getNodeQuery); - if (getNextNodesForSubmit.getSuccess()) { - getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); - data = getNextNodesForSubmit.getData().get(0).getName(); - } else { - return rb.setMsg(getNextNodesForSubmit.getMsg()); - } + ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); } else { - return rb.setMsg("参数错误：next"); + return rb.setMsg(getNextNodesForSubmit.getMsg()); } secondSalesInitVo.setTitle(data); List itemEditTextInfos = new ArrayList<>(); From 8f3047ce0288bd2e1e74e1c1185046853145da79 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 13:42:45 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terminal/biz/risk/secondarysales/SecondarySalesService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index 21b12e0bb4..3a2e5c6a1a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -212,7 +212,6 @@ public class SecondarySalesService { public ResultBean getFlowOperateTitleBy(SecondarySalesQuery query) { ResultBean rb = ResultBean.fireFail(); SecondSalesInitVo secondSalesInitVo = new SecondSalesInitVo(); - int next = query.getNext(); LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); String data = ""; From e133726a7d20f50f7fc9bcb736481117ab857b7b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 13:52:54 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyFeign.java | 4 +++ .../LoanSecondarySalesApplyRest.java | 5 ++++ .../LoanSecondarySalesApplyService.java | 30 +++++++++++++++++++ .../secondarysales/SecondarySalesService.java | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java index 6bc44536be..049ac05727 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java @@ -56,6 +56,10 @@ public interface LoanSecondarySalesApplyFeign { @GetMapping(value = "/getNextNodesForSubmit") ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query); + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getAppNextNodesForSubmit") + ResultBean> getAppNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query); + @ApiOperation(value = "驳回任务") @PostMapping(value = "/reject") public ResultBean taskReject(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java index 3bbe37b1bb..ea71c5116f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java @@ -72,6 +72,11 @@ public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign return loanSecondarySalesApplyService.getNextNodesForSubmit(query); } + @Override + public ResultBean> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) { + return loanSecondarySalesApplyService.getAppNextNodesForSubmit(query); + } + @Override public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) { return loanSecondarySalesApplyService.taskReject(query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index eb4da94ce9..723b76e34b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -307,6 +307,36 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(query.getBusinessSid()); + bv.setModelId(loanSecondarySalesApply.getProcDefId()); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + if ("Activity_0rm74ey".equals(bv.getTaskDefKey())) {//风控处置岗审批 + /* if (StringUtils.isBlank(query.getVehicleEvaluation())) { + return rb.setMsg("请填写评估价格"); + }*/ + LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(query.getBusinessSid()); + if (loanSecondarySalesCost != null) { + if (new BigDecimal(query.getVehicleEvaluation()).compareTo(loanSecondarySalesCost.getVehPrice()) > 0) { + variables.put("isTrue", true); + } else { + variables.put("isTrue", false); + } + } + } + appMap.put("sid", query.getBusinessSid()); + variables.put("app", appMap); + bv.setFormVariables(variables); + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanSecondarySalesApplyNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) { ResultBean rb = ResultBean.fireFail(); String businessSid = query.getBusinessSid(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index 3a2e5c6a1a..1b1d9c580e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -215,7 +215,7 @@ public class SecondarySalesService { LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); String data = ""; - ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getNextNodesForSubmit(getNodeQuery); + ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery); if (getNextNodesForSubmit.getSuccess()) { getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); data = getNextNodesForSubmit.getData().get(0).getName(); From a92eba2b0804b98ad05c97c5a325d2d20b9857cd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 14:04:19 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 496 +++++++++--------- 1 file changed, 247 insertions(+), 249 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 41b1ef6e93..cd93978036 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4418,260 +4418,258 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); - if (bankResultBean.getData() != null) { - LoanFinBank loanFinBank = bankResultBean.getData(); - if (null != loanFinBank.getReAdvances()) { - if (loanFinBank.getReAdvances() == 1) { - try { - Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); - historyEntity.setActualDate(collDate); - if (planDetails.getDueDate().compareTo(collDate) > 0) { - //未逾期 - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(planDetails.getDueDate()); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } else { - //已逾期 - historyEntity.setPrepareDate(new DateTime()); - } - } catch (ParseException e) { - e.printStackTrace(); - } - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); - jr.setCreateBySid(userSid); - SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); - jr.setCreateByName(userVo.getName()); - jr.setBusSid(planSid); - jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); - jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney())); - jr.setPayCostTitleKey("007"); - jr.setPayCostTitleValue("资方退还垫款"); - jr.setOrgSidPath(planDetails.getOrgSidPath()); - jr.setUseOrgName(planDetails.getUseOrgName()); - jr.setUseOrgSid(planDetails.getUseOrgSid()); - jr.setStaffDeptName(planDetails.getDept()); - jr.setStaffName(planDetails.getStaffName()); - jr.setStaffDeptSid(planDetails.getDeptSid()); - jr.setStaffUserSid(planDetails.getSalesUserSid()); - finUncollectedReceivablesDetailedJRService.insert(jr); - } - } - } - } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) { - try { - Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); - historyEntity.setActualDate(collDate); - if (planDetails.getDueDate().compareTo(collDate) > 0) { - //未逾期 - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(planDetails.getDueDate()); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } else { - //已逾期 - historyEntity.setPrepareDate(new DateTime()); - } - } catch (ParseException e) { - e.printStackTrace(); - } - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - } - } else { - try { - Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); - historyEntity.setActualDate(collDate); - if (planDetails.getDueDate().compareTo(collDate) > 0) { - //未逾期 - Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 - cal_1.setTime(planDetails.getDueDate()); - cal_1.add(Calendar.DAY_OF_MONTH, -1); - historyEntity.setPrepareDate(cal_1.getTime()); - } else { - //已逾期 - historyEntity.setPrepareDate(new DateTime()); - } - } catch (ParseException e) { - e.printStackTrace(); - } - historyEntity.setPaymentState("待转付"); - historyEntity.setPaymentStateKey("001"); - } - loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); - } - if (v.getReceivablesName().equals("资方逾期利息")) { - if (null != planDetails.getPaymentInterest()) { - if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) { - BigDecimal paymentInterest = planDetails.getPaymentInterest(); - String subscriptionMoney = v.getSubscriptionMoney(); - BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentInterest(subtract); - BigDecimal paymentMoney = planDetails.getPaymentMoney(); - BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentMoney(subtract2); - loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); - String orderSid = planDetails.getSalesOrderSid(); - String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData(); - String bankSid = ""; - String scheduleSid = planDetails.getScheduleSid(); - LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData(); - if (isOther.equals("0")) { - if (StringUtils.isNotBlank(schedule.getBankSid())) { - bankSid = schedule.getBankSid(); - } - } else if (isOther.equals("1")) { - if (StringUtils.isNotBlank(schedule.getOtherBankSid())) { - bankSid = schedule.getOtherBankSid(); - } - } - ResultBean bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); - if (bankResultBean.getData() != null) { - LoanFinBank loanFinBank = bankResultBean.getData(); - if (null != loanFinBank.getReAdvances()) { - if (loanFinBank.getReAdvances() == 1) { - FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); - jr.setCreateBySid(userSid); - SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); - jr.setCreateByName(userVo.getName()); - jr.setBusSid(planSid); - jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); - jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney())); - jr.setPayCostTitleKey("007"); - jr.setPayCostTitleValue("资方退还垫款"); - jr.setOrgSidPath(planDetails.getOrgSidPath()); - jr.setUseOrgName(planDetails.getUseOrgName()); - jr.setUseOrgSid(planDetails.getUseOrgSid()); - jr.setStaffDeptName(planDetails.getDept()); - jr.setStaffName(planDetails.getStaffName()); - jr.setStaffDeptSid(planDetails.getDeptSid()); - jr.setStaffUserSid(planDetails.getSalesUserSid()); - finUncollectedReceivablesDetailedJRService.insert(jr); - } - } - } - } - } - } - } - //推送间还月还收款凭证 - CollectionVoucher.CollectionVoucherDetail d = getDueMoneyAndOverDueMoneyVoucher(v, collectionDate); - voucherDetails.add(d); - } - //认资金占用费消减平台资金占用费 - if (v.getReceivablesName().equals("资金占用费")) { - String planSid = ""; + String planSid = ""; + if (v.getReceivablesName().equals("月还")) { + planSid = v.getReceivablesSid(); + } else { FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid()); if (jr != null) { planSid = jr.getBusSid(); } - LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData(); - if (null != planDetails) { - LoanPlanDetailsVoForFundVoucher f = loanRepaymentPlanDetailsFeign.getLoanPlanDetailsVoForFundVoucher(planDetails.getBusVinSid()); - if (null != f) { - List g = getFundGenralVoucher(planDetails, f); - if (!g.isEmpty()) { - g.stream().forEach(gv -> { - generalVoucherDetails.add(gv); - }); - } - LoanPushFundHistory loanPushFundHistory = new LoanPushFundHistory(); - if (null != f.getDuePushMoney()) { - loanPushFundHistory.setFund(f.getDuePushMoney()); - } - loanPushFundHistory.setBusVinSid(planDetails.getBusVinSid()); - loanPushFundHistory.setUseOrgName(planDetails.getUseOrgName()); - loanPushFundHistory.setUseOrgSid(planDetails.getUseOrgSid()); - String lastTimes = loanPushFundHistoryFeign.getLastDateByBusVinSid(planDetails.getBusVinSid()).getData(); - if (StringUtils.isNotBlank(lastTimes)) { - try { - loanPushFundHistory.setLastAccrualDate(sdfTimes.parse(lastTimes)); - } catch (ParseException e) { - e.printStackTrace(); - } - } - loanPushFundHistoryFeign.saveHistoryByEntity(loanPushFundHistory); -// fundHistoryList.add(loanPushFundHistory); - } - //推送资金占用费出纳确认后 - CollectionVoucher.CollectionVoucherDetail d = getFundVoucher(v, collectionDate, planDetails); - if (null != d) { - CollectionVoucher.CollectionVoucherDetail v1 = new CollectionVoucher.CollectionVoucherDetail(); - BeanUtil.copyProperties(d, v1); - v1.setSceneCode(SceneCodeEnum.FUND_VOUCHER1.getCode()); - voucherDetails.add(v1); - CollectionVoucher.CollectionVoucherDetail v2 = new CollectionVoucher.CollectionVoucherDetail(); - BeanUtil.copyProperties(d, v2); - v2.setSceneCode(SceneCodeEnum.FUND_VOUCHER2.getCode()); - collectionAfterVoucherDetails.add(v2); - } - } - } - //认名义价、合同违约金、其他费用收款 - if (v.getReceivablesName().equals("名义价") || - v.getReceivablesName().equals("合同违约金") || - v.getReceivablesName().equals("其他费用") || - v.getReceivablesName().equals("结清时资方逾期利息") - ) { - CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate); - voucherDetails.add(d); } + LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); + if("0".equals(busSalesOrderVehicle.getRiskState().toString())){ + //认资方退还垫款或者结清时资方逾期利息 + if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) { + CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate); + voucherDetails.add(d); + } + //推送间还待转付列表 + if (v.getReceivablesName().equals("月还") || v.getReceivablesName().equals("资方逾期利息")) { + if (null != planDetails) { + if (v.getReceivablesName().equals("月还")) { + //推送间还认款记录 + LoanRepaymentHistory historyEntity = new LoanRepaymentHistory(); + historyEntity.setPlanDetailSid(planSid); + historyEntity.setScheduleSid(planDetails.getScheduleSid()); + historyEntity.setSkdBillNo(finalConfirmation.getBillNo()); + historyEntity.setUpdateTime(new DateTime()); + historyEntity.setUpdateState("1"); + historyEntity.setDataTime(new DateTime()); + historyEntity.setBuckle("审核通过"); + historyEntity.setBuckleKey("003"); + historyEntity.setActualMoney(new BigDecimal(v.getSubscriptionMoney())); + historyEntity.setReturnWay("间还"); + historyEntity.setReturnWayKey("02"); + if (null != planDetails.getPaymentMoney()) { + if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 1) { + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + String orderSid = planDetails.getSalesOrderSid(); + String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData(); + String bankSid = ""; + String scheduleSid = planDetails.getScheduleSid(); + LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData(); + if (isOther.equals("0")) { + if (StringUtils.isNotBlank(schedule.getBankSid())) { + bankSid = schedule.getBankSid(); + } + } else if (isOther.equals("1")) { + if (StringUtils.isNotBlank(schedule.getOtherBankSid())) { + bankSid = schedule.getOtherBankSid(); + } + } + ResultBean bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); + if (bankResultBean.getData() != null) { + LoanFinBank loanFinBank = bankResultBean.getData(); + if (null != loanFinBank.getReAdvances()) { + if (loanFinBank.getReAdvances() == 1) { + try { + Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); + historyEntity.setActualDate(collDate); + if (planDetails.getDueDate().compareTo(collDate) > 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); + jr.setCreateByName(userVo.getName()); + jr.setBusSid(planSid); + jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setPayCostTitleKey("007"); + jr.setPayCostTitleValue("资方退还垫款"); + jr.setOrgSidPath(planDetails.getOrgSidPath()); + jr.setUseOrgName(planDetails.getUseOrgName()); + jr.setUseOrgSid(planDetails.getUseOrgSid()); + jr.setStaffDeptName(planDetails.getDept()); + jr.setStaffName(planDetails.getStaffName()); + jr.setStaffDeptSid(planDetails.getDeptSid()); + jr.setStaffUserSid(planDetails.getSalesUserSid()); + finUncollectedReceivablesDetailedJRService.insert(jr); + } + } + } + } else if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) == 0) { + try { + Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); + historyEntity.setActualDate(collDate); + if (planDetails.getDueDate().compareTo(collDate) > 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + } + } else { + try { + Date collDate = sdf.parse(finalConfirmation.getCollectionDate()); + historyEntity.setActualDate(collDate); + if (planDetails.getDueDate().compareTo(collDate) > 0) { + //未逾期 + Calendar cal_1 = Calendar.getInstance();// 使用默认时区和语言环境获得一个日历 + cal_1.setTime(planDetails.getDueDate()); + cal_1.add(Calendar.DAY_OF_MONTH, -1); + historyEntity.setPrepareDate(cal_1.getTime()); + } else { + //已逾期 + historyEntity.setPrepareDate(new DateTime()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + historyEntity.setPaymentState("待转付"); + historyEntity.setPaymentStateKey("001"); + } + loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity); + } + if (v.getReceivablesName().equals("资方逾期利息")) { + if (null != planDetails.getPaymentInterest()) { + if (planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO) == 1) { + BigDecimal paymentInterest = planDetails.getPaymentInterest(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentInterest(subtract); + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract2); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + String orderSid = planDetails.getSalesOrderSid(); + String isOther = loanRepaymentScheduleFeign.returnBankOrOtherBankByPlanSid(planSid).getData(); + String bankSid = ""; + String scheduleSid = planDetails.getScheduleSid(); + LoanRepaymentSchedule schedule = loanRepaymentScheduleFeign.fetchBySid(scheduleSid).getData(); + if (isOther.equals("0")) { + if (StringUtils.isNotBlank(schedule.getBankSid())) { + bankSid = schedule.getBankSid(); + } + } else if (isOther.equals("1")) { + if (StringUtils.isNotBlank(schedule.getOtherBankSid())) { + bankSid = schedule.getOtherBankSid(); + } + } + ResultBean bankResultBean = loanFinBankFeign.fetchEntityBySid(bankSid); + if (bankResultBean.getData() != null) { + LoanFinBank loanFinBank = bankResultBean.getData(); + if (null != loanFinBank.getReAdvances()) { + if (loanFinBank.getReAdvances() == 1) { + FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); + jr.setCreateBySid(userSid); + SysUserVo userVo = sysUserFeign.fetchBySid(userSid).getData(); + jr.setCreateByName(userVo.getName()); + jr.setBusSid(planSid); + jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney())); + jr.setPayCostTitleKey("007"); + jr.setPayCostTitleValue("资方退还垫款"); + jr.setOrgSidPath(planDetails.getOrgSidPath()); + jr.setUseOrgName(planDetails.getUseOrgName()); + jr.setUseOrgSid(planDetails.getUseOrgSid()); + jr.setStaffDeptName(planDetails.getDept()); + jr.setStaffName(planDetails.getStaffName()); + jr.setStaffDeptSid(planDetails.getDeptSid()); + jr.setStaffUserSid(planDetails.getSalesUserSid()); + finUncollectedReceivablesDetailedJRService.insert(jr); + } + } + } + } + } + } + } + //推送间还月还收款凭证 + CollectionVoucher.CollectionVoucherDetail d = getDueMoneyAndOverDueMoneyVoucher(v, collectionDate); + voucherDetails.add(d); + } + //认资金占用费消减平台资金占用费 + if (v.getReceivablesName().equals("资金占用费")) { + if (null != planDetails) { + LoanPlanDetailsVoForFundVoucher f = loanRepaymentPlanDetailsFeign.getLoanPlanDetailsVoForFundVoucher(planDetails.getBusVinSid()); + if (null != f) { + List g = getFundGenralVoucher(planDetails, f); + if (!g.isEmpty()) { + g.stream().forEach(gv -> { + generalVoucherDetails.add(gv); + }); + } + LoanPushFundHistory loanPushFundHistory = new LoanPushFundHistory(); + if (null != f.getDuePushMoney()) { + loanPushFundHistory.setFund(f.getDuePushMoney()); + } + loanPushFundHistory.setBusVinSid(planDetails.getBusVinSid()); + loanPushFundHistory.setUseOrgName(planDetails.getUseOrgName()); + loanPushFundHistory.setUseOrgSid(planDetails.getUseOrgSid()); + String lastTimes = loanPushFundHistoryFeign.getLastDateByBusVinSid(planDetails.getBusVinSid()).getData(); + if (StringUtils.isNotBlank(lastTimes)) { + try { + loanPushFundHistory.setLastAccrualDate(sdfTimes.parse(lastTimes)); + } catch (ParseException e) { + e.printStackTrace(); + } + } + loanPushFundHistoryFeign.saveHistoryByEntity(loanPushFundHistory); +// fundHistoryList.add(loanPushFundHistory); + } + //推送资金占用费出纳确认后 + CollectionVoucher.CollectionVoucherDetail d = getFundVoucher(v, collectionDate, planDetails); + if (null != d) { + CollectionVoucher.CollectionVoucherDetail v1 = new CollectionVoucher.CollectionVoucherDetail(); + BeanUtil.copyProperties(d, v1); + v1.setSceneCode(SceneCodeEnum.FUND_VOUCHER1.getCode()); + voucherDetails.add(v1); + CollectionVoucher.CollectionVoucherDetail v2 = new CollectionVoucher.CollectionVoucherDetail(); + BeanUtil.copyProperties(d, v2); + v2.setSceneCode(SceneCodeEnum.FUND_VOUCHER2.getCode()); + collectionAfterVoucherDetails.add(v2); + } + } + } + //认名义价、合同违约金、其他费用收款 + if (v.getReceivablesName().equals("名义价") || + v.getReceivablesName().equals("合同违约金") || + v.getReceivablesName().equals("其他费用") || + v.getReceivablesName().equals("结清时资方逾期利息") + ) { + CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate); + voucherDetails.add(d); + } + } + }); //查询该申请已认款金额总数 subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); From 32fe6b5e93646d2f55349d5ea41fd9f75d844278 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 14:42:43 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE-=E9=A3=8E=E6=8E=A7=E5=B2=97=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=97=B6=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=BB=98=E8=AE=A4=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A3=8E=E6=8E=A7=E9=83=A8=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E6=89=B9/=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 13 ------------- .../risk/secondarysales/SecondarySalesService.java | 6 +++--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 723b76e34b..54aedd9ceb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -315,19 +315,6 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - if ("Activity_0rm74ey".equals(bv.getTaskDefKey())) {//风控处置岗审批 - /* if (StringUtils.isBlank(query.getVehicleEvaluation())) { - return rb.setMsg("请填写评估价格"); - }*/ - LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(query.getBusinessSid()); - if (loanSecondarySalesCost != null) { - if (new BigDecimal(query.getVehicleEvaluation()).compareTo(loanSecondarySalesCost.getVehPrice()) > 0) { - variables.put("isTrue", true); - } else { - variables.put("isTrue", false); - } - } - } appMap.put("sid", query.getBusinessSid()); variables.put("app", appMap); bv.setFormVariables(variables); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index 1b1d9c580e..4540b1fdcb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -214,14 +214,14 @@ public class SecondarySalesService { SecondSalesInitVo secondSalesInitVo = new SecondSalesInitVo(); LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery(); BeanUtil.copyProperties(query, getNodeQuery); - String data = ""; - ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery); + String data = "风控中心风控部经理审批/结束"; + /*ResultBean> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery); if (getNextNodesForSubmit.getSuccess()) { getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); data = getNextNodesForSubmit.getData().get(0).getName(); } else { return rb.setMsg(getNextNodesForSubmit.getMsg()); - } + }*/ secondSalesInitVo.setTitle(data); List itemEditTextInfos = new ArrayList<>(); ItemEditTextInfoCommon itemEditTextInfo = new ItemEditTextInfoCommon(); From 6d8a14e76c7ece34c0f77f39b71f18770f78e100 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 15:08:54 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8A=9E=E7=BB=93=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E9=87=91=E8=9E=8D=E5=BA=94=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 130 +++++++++++------- 1 file changed, 81 insertions(+), 49 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 54aedd9ceb..454f41e08d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -603,69 +603,101 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + try { + ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() + .setNameFormat("demo-pool-%d").build(); + ExecutorService pool = new ThreadPoolExecutor(2, 100, + 0L, TimeUnit.MILLISECONDS, + new LinkedBlockingQueue(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); + LoanSecondarySalesApply finalLoanSecondarySalesApply = loanSecondarySalesApply; + Future future1 = pool.submit(() -> { + //极光推送 + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowVo.setProcDefId(finalLoanSecondarySalesApply.getProcDefId()); + messageFlowVo.setProcInsId(finalLoanSecondarySalesApply.getProcInstId()); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("交回车辆二次销售申请"); + messageFlowableQuery.setMsgContent(finalLoanSecondarySalesApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("交回车辆二次销售申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); + }); + } catch (Exception e) { + e.printStackTrace(); + } } return rb.success().setData(resultBean.getData()); } else { From 0454d7b3a6672e621a3668d96b186597117582ed Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 12 May 2025 15:33:39 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8A=9E=E7=BB=93=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E9=87=91=E8=9E=8D=E5=BA=94=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 454f41e08d..a239c24489 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -614,6 +614,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService Date: Mon, 12 May 2025 16:19:14 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/statement/rebateType.js | 20 ++ .../src/router/modules/codemenu.js | 9 + .../rebateSummary/rebateTypeDetails.vue | 117 +++++++++ .../rebateType/rebateTypeByDetail.vue | 246 ++++++++++++++++++ 4 files changed, 392 insertions(+) create mode 100644 anrui-scm/anrui-scm-ui/src/api/statement/rebateType.js create mode 100644 anrui-scm/anrui-scm-ui/src/views/statement/rebateSummary/rebateTypeDetails.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/statement/rebateType.js b/anrui-scm/anrui-scm-ui/src/api/statement/rebateType.js new file mode 100644 index 0000000000..fa3823c0e3 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/api/statement/rebateType.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/typeStatistics', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + getTypeDetail: function(data) { + return request({ + url: '/scm/v1/scmvehrebate/getTypeDetail', + method: 'post', + params: data + }) + } +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 4498cb421c..fb87fcf0eb 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -1100,6 +1100,15 @@ const codemenu = [{ title: '单车返利统计', noCache: true } + }, + { + path: '/statement/rebateType', + component: () => import('@/views/statement/rebateType/rebateTypeByDetail.vue'), + name: 'RebateTypeByDetail', + meta: { + title: '厂家返利类型', + noCache: true + } } // { // path: '/statement/rebateSummary', diff --git a/anrui-scm/anrui-scm-ui/src/views/statement/rebateSummary/rebateTypeDetails.vue b/anrui-scm/anrui-scm-ui/src/views/statement/rebateSummary/rebateTypeDetails.vue new file mode 100644 index 0000000000..01c6644d88 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/statement/rebateSummary/rebateTypeDetails.vue @@ -0,0 +1,117 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue b/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue new file mode 100644 index 0000000000..f5c0e86670 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateTypeByDetail.vue @@ -0,0 +1,246 @@ + + + + From 4c4a007d443dd264f1579229fed6e1c67621a3a6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 12 May 2025 16:21:16 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rebateType/rebateNameByDetail.vue | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateNameByDetail.vue diff --git a/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateNameByDetail.vue b/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateNameByDetail.vue new file mode 100644 index 0000000000..98e43ab59a --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/statement/rebateType/rebateNameByDetail.vue @@ -0,0 +1,103 @@ + + + + +