From d60e4f809996f594810ab6c329834c700edf852d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 11 Oct 2024 09:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E9=87=91=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E8=B4=B9=E8=AE=A4=E6=AC=BE=E6=97=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=AE=A1=E6=8F=90=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java             | 11 ++++++-----
 .../loanpushfundhistory/LoanPushFundHistoryFeign.java |  5 ++++-
 .../LoanPushFundHistoryFeignFallback.java             |  7 ++++++-
 .../loanpushfundhistory/LoanPushFundHistoryRest.java  |  5 +++++
 4 files changed, 21 insertions(+), 7 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 3162709026..a4a85eb7ae 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
@@ -3853,7 +3853,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         List<GeneralVoucher.GeneralVoucherDetail> generalVoucherDetails = new ArrayList<>();
         //--------------推送资金占用费计提记录表--------------------
-        List<LoanPushFundHistory> fundHistoryList = new ArrayList<>();
+//        List<LoanPushFundHistory> fundHistoryList = new ArrayList<>();
         //-------资金占用费出纳确认收入---------
         CollectionVoucher collectionAfterVoucher = new CollectionVoucher();
         //收款方式key
@@ -4076,7 +4076,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     e.printStackTrace();
                                 }
                             }
-                            fundHistoryList.add(loanPushFundHistory);
+                            loanPushFundHistoryFeign.saveHistoryByEntity(loanPushFundHistory);
+//                            fundHistoryList.add(loanPushFundHistory);
                         }
                         //推送资金占用费出纳确认后
                         CollectionVoucher.CollectionVoucherDetail d = getFundVoucher(v, collectionDate, planDetails);
@@ -4122,9 +4123,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             generalVoucher.setVoucherDetails(generalVoucherDetails);
             finKingDeeFeignRest.saveFundVoucher(generalVoucher);
         }
-        if (!fundHistoryList.isEmpty()) {
-            loanPushFundHistoryFeign.saveHistory(fundHistoryList);
-        }
+//        if (!fundHistoryList.isEmpty()) {
+//            loanPushFundHistoryFeign.saveHistory(fundHistoryList);
+//        }
         if (!voucherDetails.isEmpty()) {
             collectionVoucher.setVoucherDetails(voucherDetails);
             finKingDeeFeignRest.saveCollectionVoucher(collectionVoucher);
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeign.java
index f0fcae9bef..6ea435da0a 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeign.java
@@ -30,6 +30,9 @@ public interface LoanPushFundHistoryFeign {
     @PostMapping("/saveHistory")
     public int saveHistory(@RequestBody List<LoanPushFundHistory> fundHistoryList);
 
+    @PostMapping("/saveHistoryByEntity")
+    public int saveHistoryByEntity(@RequestBody LoanPushFundHistory loanPushFundHistory);
+
     @ApiOperation("资金占用费计提列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<LoanPushFundHistoryVo>> listPage(@RequestBody PagerQuery<LoanPushFundHistoryQuery> pq);
@@ -41,4 +44,4 @@ public interface LoanPushFundHistoryFeign {
     @ApiOperation("下载资金占用费计提记录dpf")
     @PostMapping("/fundCreatePdf")
     public ResultBean<String> fundCreatePdf(@RequestParam("times") String times, @RequestParam("orgPath") String orgPath);
-}
\ No newline at end of file
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeignFallback.java
index 4d1deb3677..ad6c524f3b 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpushfundhistory/LoanPushFundHistoryFeignFallback.java
@@ -18,6 +18,11 @@ public class LoanPushFundHistoryFeignFallback implements LoanPushFundHistoryFeig
         return 0;
     }
 
+    @Override
+    public int saveHistoryByEntity(LoanPushFundHistory loanPushFundHistory) {
+        return 0;
+    }
+
     @Override
     public ResultBean<PagerVo<LoanPushFundHistoryVo>> listPage(PagerQuery<LoanPushFundHistoryQuery> pq) {
         return null;
@@ -32,4 +37,4 @@ public class LoanPushFundHistoryFeignFallback implements LoanPushFundHistoryFeig
     public ResultBean<String> fundCreatePdf(String times, String orgPath) {
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryRest.java
index 38006462e4..8cb8cfd3f8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryRest.java
@@ -29,6 +29,11 @@ public class LoanPushFundHistoryRest implements LoanPushFundHistoryFeign {
         return loanPushFundHistoryService.saveLists(fundHistoryList);
     }
 
+    @Override
+    public int saveHistoryByEntity(LoanPushFundHistory loanPushFundHistory) {
+        return loanPushFundHistoryService.insert(loanPushFundHistory);
+    }
+
     @Override
     public ResultBean<PagerVo<LoanPushFundHistoryVo>> listPage(PagerQuery<LoanPushFundHistoryQuery> pq) {
         ResultBean<PagerVo<LoanPushFundHistoryVo>> rb = ResultBean.fireFail();