From 0cc7265a2a55d1c294dbd3ae25595444f020e94c Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 1 Apr 2025 22:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/finpaymentrecord/FinPaymentrecordFeign.java   |  5 -----
 .../FinPaymentrecordFeignFallback.java                |  5 -----
 .../biz/finpaymentrecord/FinPaymentrecordRest.java    |  7 -------
 .../biz/finpaymentrecord/FinPaymentrecordService.java | 11 +++++++----
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
index 8b30982d88..3b4b4c0bb7 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
@@ -90,9 +90,4 @@ public interface FinPaymentrecordFeign {
     @GetMapping("/fetchBySid")
     @ResponseBody
     ResultBean<FinPaymentrecord> fetchBySid(@RequestParam("sid") String sid);
-
-    @ApiOperation("出纳付款列表推送财务凭证")
-    @PostMapping("/pushVoucher")
-    @ResponseBody
-    public ResultBean pushVoucher(@RequestParam("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
index 1569c7d105..bf8a5e1ce4 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
@@ -83,9 +83,4 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
     public ResultBean<FinPaymentrecord> fetchBySid(String sid) {
         return null;
     }
-
-    @Override
-    public ResultBean pushVoucher(String sid) {
-        return null;
-    }
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
index 2d0e6c6421..91c8c7c801 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
@@ -97,11 +97,4 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
         FinPaymentrecord finPaymentrecord = finPaymentrecordService.fetchBySid(sid);
         return rb.success().setData(finPaymentrecord);
     }
-
-    @Override
-    public ResultBean pushVoucher(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        finPaymentrecordService.pushVoucher(sid);
-        return rb.success();
-    }
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 8b1e17fe12..095cb0ab2e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -618,6 +618,9 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                         }
                         loanSettleApplyFeign.pushBankVoucher(finPaymentrecord.getBusSid(), accountNumber, payTypeCode, shouxufei);
                     }
+                } else if (StringUtils.isBlank(costTypeKey) || "015".equals(costTypeKey) || "016".equals(costTypeKey) || "017".equals(costTypeKey)) {
+                    Voucher voucher = pushVoucher(finPaymentrecord.getSid());
+                    voucherService.saveVoucher(voucher);
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -987,7 +990,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                             vouchers.add(v);
                         }
                     }
-                }else if (StringUtils.isBlank(costTypeKey) || "015".equals(costTypeKey) || "016".equals(costTypeKey) || "017".equals(costTypeKey)){
+                } else if (StringUtils.isBlank(costTypeKey) || "015".equals(costTypeKey) || "016".equals(costTypeKey) || "017".equals(costTypeKey)) {
                     Voucher voucher = pushVoucher(finPaymentrecord.getSid());
                     if (null != voucher) {
                         vouchers.add(voucher);
@@ -1684,7 +1687,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
             voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
             voucherResultDetailDtos.add(voucherResultDetailDto);
-        }else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())){//平仓款
+        } else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款
             //查询平仓总付款金额
             FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
             BigDecimal exePayPriceTotal = finPaymentapplyDetailsBelowEveService.selExePayByMainSid(finPaymentapplyDetailsBelowEve.getDetailSid());
@@ -1693,7 +1696,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             BigDecimal payAccount = finPaymentapplyDetailsBelow.getPayAccount();
             //查询已付款平仓款金额
             BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
-            if (payPriceTotal.add(finPaymentrecord.getCost()).compareTo(exePayPriceTotal) == -1){
+            if (payPriceTotal.add(finPaymentrecord.getCost()).compareTo(exePayPriceTotal) == -1) {
                 //借方
                 voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
                 voucherResultDetailDto.setSubjectNo("1009.03");
@@ -1709,7 +1712,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDto);
-            }else {
+            } else {
                 //借方
                 voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
                 voucherResultDetailDto.setSubjectNo("2111");