From 8d0d14d6d9df99acd02392f5a8e902e883ef5dd4 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 27 Jul 2023 10:22:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busmaindeposit/BusMainDepositService.java | 49 ++++++++++---------
 .../FinCollectionConfirmationService.java     |  5 ++
 .../FinFundsCarriedForwardApplyService.java   | 37 +++++++-------
 3 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 2fd051ccfe..9ea4da66a6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1223,30 +1223,33 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //极光推送
             busMainDeposit = fetchBySid(businessSid);
-            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());
-                BusMainDeposit finalBusMainDeposit = busMainDeposit;
-                Future future1 = pool.submit(() -> {
-                    MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                    MessageFlowVo messageFlowVo = new MessageFlowVo();
-                    BeanUtil.copyProperties(ufVo, messageFlowVo);
-                    ufVo.setProcInsId(finalBusMainDeposit.getProcInsId());
-                    messageFlowableQuery.setUfVo(messageFlowVo);
-                    messageFlowableQuery.setAppMap(appMap);
-                    messageFlowableQuery.setBusinessSid(businessSid);
-                    messageFlowableQuery.setModuleName("简易订单-订金申请");
-                    messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                    messageFlowableQuery.setMsgTitle("简易订单");
-                    ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
+            if ("Event_end".equals(ufVo.getTaskDefKey())) {
+                pushFin(businessSid);
+            }else{
+                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());
+                    BusMainDeposit finalBusMainDeposit = busMainDeposit;
+                    Future future1 = pool.submit(() -> {
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVo, messageFlowVo);
+                        ufVo.setProcInsId(finalBusMainDeposit.getProcInsId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap(appMap);
+                        messageFlowableQuery.setBusinessSid(businessSid);
+                        messageFlowableQuery.setModuleName("简易订单-订金申请");
+                        messageFlowableQuery.setMsgContent(finalBusMainDeposit.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle("简易订单");
+                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
-
             return voResultBean;
         }
         if (r == 2) {
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 25c6df822f..62bfbd3cb0 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
@@ -2588,6 +2588,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         finSelectedReceivablesDetailed.setSubscriptionMoney(confirmation.getCollectionMoney());
         finSelectedReceivablesDetailed.setUseOrgSid(confirmation.getUseOrgSid());
         finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
+        finSelectedReceivablesDetailed.setPurchaseSystemSid(confirmation.getPurchaseSystemSid());
+        finSelectedReceivablesDetailed.setPurchaseSystemName(confirmation.getPurchaseSystemName());
         finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
         if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
             //添加进附件表
@@ -2769,6 +2771,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         });
         confirmation.setAuditState(4);
         confirmation.setReason("申请人已撤回");
+        confirmation.setConfirmDate("");
+        confirmation.setConfirmName("");
+        confirmation.setConfirmNameSid("");
         baseMapper.updateById(confirmation);
         return rb.success().setMsg("撤回成功");
     }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
index 626dfbf567..a59c9000b6 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
@@ -1453,24 +1453,27 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             for (FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList) {
                 String busSid = v.getBusSid();
                 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
-                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
-                //结转金额
-                //查询该车的所有认款，是否都已认完
-                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
-                    //已认款完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
-                } else {
-                    //认款未完成
-                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
-                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                    dtoList.add(baseVehicleStateDto);
+                if(StringUtils.isNotBlank(finSelectedReceivablesDetailed.getReceivablesSid())){
+                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                    //结转金额
+                    //查询该车的所有认款，是否都已认完
+                    String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) >= 0) {
+                        //已认款完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    } else {
+                        //认款未完成
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                        baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                        dtoList.add(baseVehicleStateDto);
+                    }
                 }
+
             }
         }
         List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid);