From fb7f1589651d656dec566cf76d8f1e2396b8d99b Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 27 May 2025 08:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepurchaseApplyService.java           | 30 ++++++++-
 .../LoanSettleApplyService.java               | 62 +++++++++++--------
 2 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
index 37c8c6bf11..277a34def2 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
@@ -46,6 +46,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
@@ -57,6 +58,7 @@ import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
 import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanrelievemortgage.LoanRelieveMortgageService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecompanycost.LoanRepurchaseCompanyCostService;
 import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loansettleapply.LoanSettleApplyService;
@@ -128,7 +130,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
     @Autowired
     private MessageListFeign messageListFeign;
-
+    @Autowired
+    private LoanRelieveMortgageService loanRelieveMortgageService;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
@@ -740,7 +743,30 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 baseMapper.updateById(repurchaseApply);
                 //更新车辆表回购状态为1
                 baseMapper.updateBus(repurchaseApply.getBusVinSid());
-
+                //推送待解抵
+                LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
+                loanRelieveMortgageSaveDto.setCreateBySid(repurchaseApply.getCreateBySid());
+                loanRelieveMortgageSaveDto.setUseOrgSid(repurchaseApply.getUseOrgSid());
+                loanRelieveMortgageSaveDto.setUseOrgName(repurchaseApply.getUseOrgName());
+                loanRelieveMortgageSaveDto.setOrgSidPath(repurchaseApply.getOrgSidPath());
+                loanRelieveMortgageSaveDto.setBusVinSid(repurchaseApply.getBusVinSid());
+                loanRelieveMortgageSaveDto.setVinNo(repurchaseApply.getVinNo());
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(repurchaseApply.getBusVinSid()).getData();
+                loanRelieveMortgageSaveDto.setVehSid(busSalesOrderVehicle.getLinkSid());
+                loanRelieveMortgageSaveDto.setVehMark(repurchaseApply.getVehMark());
+                loanRelieveMortgageSaveDto.setLoanContractNo(repurchaseApply.getLoanContractNo());
+                loanRelieveMortgageSaveDto.setBankContractNo(repurchaseApply.getBankContractNo());
+                loanRelieveMortgageSaveDto.setDept(repurchaseApply.getCreateDept());
+                loanRelieveMortgageSaveDto.setDeptSid(repurchaseApply.getCreateDeptSid());
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                loanRelieveMortgageSaveDto.setSalesman(busSalesOrder.getStaffName());
+                loanRelieveMortgageSaveDto.setSalesmanSid(busSalesOrder.getStaffSid());
+                loanRelieveMortgageSaveDto.setBorrowerName(repurchaseApply.getLoanName());
+                loanRelieveMortgageSaveDto.setBorrowerSid(repurchaseApply.getLoanSid());
+                loanRelieveMortgageSaveDto.setCustomer(repurchaseApply.getCustomerName());
+                loanRelieveMortgageSaveDto.setCustomerSid(repurchaseApply.getCustomerSid());
+                loanRelieveMortgageSaveDto.setBankName(repurchaseApply.getBankName());
+                loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index f1d45a0c95..a2797038bf 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -978,34 +978,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                     //推送财务凭证
                     pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
-                    if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
-
+                    if (StringUtils.isBlank(loanSettleApply.getBusSid())) {//非回购
+                        //推送待解抵
+                        pushRelieveMortgag(loanSettleApply);
                     }
                 }
                 baseMapper.updateById(loanSettleApply);
-                LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
-                loanRelieveMortgageSaveDto.setCreateBySid(loanSettleApply.getCreateBySid());
-                loanRelieveMortgageSaveDto.setUseOrgSid(loanSettleApply.getUseOrgSid());
-                loanRelieveMortgageSaveDto.setUseOrgName(loanSettleApply.getUseOrgName());
-                loanRelieveMortgageSaveDto.setOrgSidPath(loanSettleApply.getOrgSidPath());
-                loanRelieveMortgageSaveDto.setBusVinSid(loanSettleApply.getBusVinSid());
-                loanRelieveMortgageSaveDto.setVinNo(loanSettleApply.getVinNo());
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(loanSettleApply.getBusVinSid()).getData();
-                loanRelieveMortgageSaveDto.setVehSid(busSalesOrderVehicle.getLinkSid());
-                loanRelieveMortgageSaveDto.setVehMark(loanSettleApply.getVehMark());
-                loanRelieveMortgageSaveDto.setLoanContractNo(loanSettleApply.getLoanContractNo());
-                loanRelieveMortgageSaveDto.setBankContractNo(loanSettleApply.getBankContractNo());
-                loanRelieveMortgageSaveDto.setDept(loanSettleApply.getCreateDept());
-                loanRelieveMortgageSaveDto.setDeptSid(loanSettleApply.getCreateDeptSid());
-                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
-                loanRelieveMortgageSaveDto.setSalesman(busSalesOrder.getStaffName());
-                loanRelieveMortgageSaveDto.setSalesmanSid(busSalesOrder.getStaffSid());
-                loanRelieveMortgageSaveDto.setBorrowerName(loanSettleApply.getLoanName());
-                loanRelieveMortgageSaveDto.setBorrowerSid(loanSettleApply.getLoanSid());
-                loanRelieveMortgageSaveDto.setCustomer(loanSettleApply.getCustomerName());
-                loanRelieveMortgageSaveDto.setCustomerSid(loanSettleApply.getCustomerSid());
-                loanRelieveMortgageSaveDto.setBankName(loanSettleApply.getBankName());
-                loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
             } else {
                 //极光推送
                 loanSettleApply = fetchBySid(businessSid);
@@ -1028,6 +1006,35 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
     }
 
+    /*
+    * 推送待解抵
+    * */
+    private void pushRelieveMortgag(LoanSettleApply loanSettleApply) {
+        LoanRelieveMortgageSaveDto loanRelieveMortgageSaveDto = new LoanRelieveMortgageSaveDto();
+        loanRelieveMortgageSaveDto.setCreateBySid(loanSettleApply.getCreateBySid());
+        loanRelieveMortgageSaveDto.setUseOrgSid(loanSettleApply.getUseOrgSid());
+        loanRelieveMortgageSaveDto.setUseOrgName(loanSettleApply.getUseOrgName());
+        loanRelieveMortgageSaveDto.setOrgSidPath(loanSettleApply.getOrgSidPath());
+        loanRelieveMortgageSaveDto.setBusVinSid(loanSettleApply.getBusVinSid());
+        loanRelieveMortgageSaveDto.setVinNo(loanSettleApply.getVinNo());
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(loanSettleApply.getBusVinSid()).getData();
+        loanRelieveMortgageSaveDto.setVehSid(busSalesOrderVehicle.getLinkSid());
+        loanRelieveMortgageSaveDto.setVehMark(loanSettleApply.getVehMark());
+        loanRelieveMortgageSaveDto.setLoanContractNo(loanSettleApply.getLoanContractNo());
+        loanRelieveMortgageSaveDto.setBankContractNo(loanSettleApply.getBankContractNo());
+        loanRelieveMortgageSaveDto.setDept(loanSettleApply.getCreateDept());
+        loanRelieveMortgageSaveDto.setDeptSid(loanSettleApply.getCreateDeptSid());
+        BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+        loanRelieveMortgageSaveDto.setSalesman(busSalesOrder.getStaffName());
+        loanRelieveMortgageSaveDto.setSalesmanSid(busSalesOrder.getStaffSid());
+        loanRelieveMortgageSaveDto.setBorrowerName(loanSettleApply.getLoanName());
+        loanRelieveMortgageSaveDto.setBorrowerSid(loanSettleApply.getLoanSid());
+        loanRelieveMortgageSaveDto.setCustomer(loanSettleApply.getCustomerName());
+        loanRelieveMortgageSaveDto.setCustomerSid(loanSettleApply.getCustomerSid());
+        loanRelieveMortgageSaveDto.setBankName(loanSettleApply.getBankName());
+        loanRelieveMortgageService.saveRelieveMortgage(loanRelieveMortgageSaveDto);
+    }
+
     //---------------------------------- 结清生成应收新逻辑 ---------------------
     private void pushNewUnLists(LoanSettleApply loanSettleApply) {
         List<FinUncollectedReceivablesDetailedJR> list = new ArrayList<>();
@@ -3686,6 +3693,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
         //推送财务凭证
         pushSettleVoucher2(loanSettleApply, 1, settleVoucherVos);
+        //非回购
+        if (StringUtils.isBlank(loanSettleApply.getBusSid())) {
+            //推送待解抵
+            pushRelieveMortgag(loanSettleApply);
+        }
         return rb.success();
     }