From 6d8a14e76c7ece34c0f77f39b71f18770f78e100 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 12 May 2025 15:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8A=9E=E7=BB=93=E5=90=8E=E6=8E=A8=E9=80=81=E7=9A=84?=
 =?UTF-8?q?=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<LoanSecon
                 finUncollectedReceivablesDetailedJR.setOrgSidPath(loanSecondarySalesApply.getOrgSidPath());
                 finUncollectedReceivablesDetailedJR.setKxState("01");
                 if ("02".equals(loanSecondarySalesCost.getBankSettleCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("017");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("预计资方结清费用");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getBankSettleCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getBankSettleCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getBankSettleCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("017");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("预计资方结清费用");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getBankSettleCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getBankSettleCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
                 if ("02".equals(loanSecondarySalesCost.getVehicleViolationCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("018");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("车辆违章费用");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getVehicleViolationCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getVehicleViolationCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getVehicleViolationCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("018");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("车辆违章费用");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getVehicleViolationCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getVehicleViolationCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
+
                 if ("02".equals(loanSecondarySalesCost.getInspectYearCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("019");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("年检费");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getInspectYearCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getInspectYearCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getInspectYearCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("019");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("年检费");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getInspectYearCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getInspectYearCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
                 }
                 if ("02".equals(loanSecondarySalesCost.getInsureCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("020");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("保险费");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getInsureCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getInsureCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getInsureCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("020");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("保险费");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getInsureCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getInsureCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
                 if ("02".equals(loanSecondarySalesCost.getOwnershipCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("021");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("过户费");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getOwnershipCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getOwnershipCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getOwnershipCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("021");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("过户费");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getOwnershipCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getOwnershipCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
                 if ("02".equals(loanSecondarySalesCost.getStopCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("022");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("停车费");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getStopCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getStopCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getStopCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("022");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("停车费");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getStopCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getStopCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
                 if ("02".equals(loanSecondarySalesCost.getOtherCostAssumeKey())){
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("023 ");
-                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("其他费用");
-                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanSecondarySalesCost.getOtherCostAssume()));
-                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanSecondarySalesCost.getOtherCostAssume()));
-                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    if(loanSecondarySalesCost.getOtherCost() != null){
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleKey("023 ");
+                        finUncollectedReceivablesDetailedJR.setPayCostTitleValue("其他费用");
+                        finUncollectedReceivablesDetailedJR.setReveivableMoney(loanSecondarySalesCost.getOtherCost());
+                        finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(loanSecondarySalesCost.getOtherCost());
+                        finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
+                    }
+
                 }
             } else {
-                //极光推送
-                loanSecondarySalesApply = fetchBySid(businessSid);
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVo, messageFlowVo);
-                messageFlowVo.setProcDefId(loanSecondarySalesApply.getProcDefId());
-                messageFlowVo.setProcInsId(loanSecondarySalesApply.getProcInstId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap(appMap);
-                messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("交回车辆二次销售申请");
-                messageFlowableQuery.setMsgContent(loanSecondarySalesApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("交回车辆二次销售申请");
-                ResultBean<String> 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<Runnable>(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<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {