From fe40c1cae33386984a98ae203de0bb45a16472eb Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 19 May 2025 14:34:09 +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

---
 .../FinCollectionConfirmationService.java     | 138 +++++++++++++++++-
 1 file changed, 135 insertions(+), 3 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 06735cc141..25161788d2 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
@@ -4724,8 +4724,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                  String collectionDate, Voucher voucher,String userSid) {
         List<Voucher.VoucherResultDetailDto> list = new ArrayList<>();
         List<Voucher.VoucherResultDetailDto> list2 = new ArrayList<>();
+        List<Voucher.VoucherResultDetailDto> list3 = new ArrayList<>();
+        List<Voucher.VoucherResultDetailDto> list4 = new ArrayList<>();
         BigDecimal all = BigDecimal.ZERO;//赎回
         BigDecimal all2 = BigDecimal.ZERO;//二次销售
+        BigDecimal all3 = BigDecimal.ZERO;//亏损立案
+        BigDecimal all4 = BigDecimal.ZERO;//亏损立案
         BigDecimal otherMoney = BigDecimal.ZERO;
         String payType = "";
         DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(finalConfirmation.getCollectionTypeKey(), "payVoucherType").getData();
@@ -5243,7 +5247,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if ("预计资方结清费用".equals(v.getReceivablesName())) {
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
-                        voucherResultDetailDtoDf3.setSummary(planDetails.getVinNo()+"扣回车辆再次销售-资方结清费用");
+                        voucherResultDetailDtoDf3.setSummary(customerNumber+"扣回车辆再次销售-资方结清费用");
                         voucherResultDetailDtoDf3.setSubjectNo("1201.03.01");
                         //核算部门
                         voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
@@ -5270,6 +5274,104 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     ) {
                         otherMoney = otherMoney.add(new BigDecimal(v.getSubscriptionMoney()));
                     }
+                }else if("6".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损立案
+                    if("诉讼费".equals(v.getReceivablesName())){
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                        all3 = all3.add(new BigDecimal(v.getSubscriptionMoney()));
+                        voucherResultDetailDtoDf.setSummary(customerNumber+"诉讼回款诉讼费");
+                        voucherResultDetailDtoDf.setSubjectNo("2191.25");
+                        //核算部门
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
+                        list3.add(voucherResultDetailDtoDf);
+                    }
+                    if ("资金占用费".equals(v.getReceivablesName())) {
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
+                        all3 = all3.add(new BigDecimal(v.getSubscriptionMoney()));
+                        voucherResultDetailDtoDf2.setSummary(customerNumber+"诉讼回款资金占用费");
+                        voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
+                        //核算部门
+                        voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
+                        list3.add(voucherResultDetailDtoDf2);
+                        //------------------------资金占用费转收入
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoJfZjzyf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoJfZjzyf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoJfZjzyf.setSubjectNo("2191.05.00");
+                        //核算部门
+                        voucherResultDetailDtoJfZjzyf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoJfZjzyf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJfZjzyf.setDebit(v.getSubscriptionMoney());
+                        list3.add(voucherResultDetailDtoJfZjzyf);
+                        //资金占用费转收入--其他业务收入_消贷收入_消贷利息
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDfZjzyf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoDfZjzyf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoDfZjzyf.setSubjectNo("6002.01.19");
+                        //核算部门
+                        voucherResultDetailDtoDfZjzyf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDfZjzyf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
+                        list3.add(voucherResultDetailDtoDfZjzyf);
+                    }
+                    //ToDo:应收贷款车欠款_待处理欠款_处置车辆_已诉讼
+
+
+
+                }else if("7".equals(busSalesOrderVehicle.getRiskState().toString())){//亏损执行
+                    if("诉讼费".equals(v.getReceivablesName())){
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                        all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
+                        voucherResultDetailDtoDf.setSummary(customerNumber+"执行回款诉讼费");
+                        voucherResultDetailDtoDf.setSubjectNo("2191.25");
+                        //核算部门
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
+                        list4.add(voucherResultDetailDtoDf);
+
+                    }
+                    if("资金占用费".equals(v.getReceivablesName())){
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
+                        all4 = all4.add(new BigDecimal(v.getSubscriptionMoney()));
+                        voucherResultDetailDtoDf2.setSummary(customerNumber+"执行回款-资金占用费");
+                        voucherResultDetailDtoDf2.setSubjectNo("1201.02.02");
+                        //核算部门
+                        voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
+                        list4.add(voucherResultDetailDtoDf2);
+                        //------------------------资金占用费转收入
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoJfZjzyf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoJfZjzyf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoJfZjzyf.setSubjectNo("2191.05.00");
+                        //核算部门
+                        voucherResultDetailDtoJfZjzyf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoJfZjzyf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJfZjzyf.setDebit(v.getSubscriptionMoney());
+                        list4.add(voucherResultDetailDtoJfZjzyf);
+                        //资金占用费转收入--其他业务收入_消贷收入_消贷利息
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDfZjzyf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoDfZjzyf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoDfZjzyf.setSubjectNo("6002.01.19");
+                        //核算部门
+                        voucherResultDetailDtoDfZjzyf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDfZjzyf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDfZjzyf.setCredit(v.getSubscriptionMoney());
+                        list4.add(voucherResultDetailDtoDfZjzyf);
+                    }
+                    //ToDo:多收款转收入
+                    //TodO:应收贷款车欠款_待处理欠款_待执行
+
                 }
             }
 
@@ -5308,16 +5410,46 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             voucherResultDetailDtoJf.setDebit(String.valueOf(all2));
             list2.add(voucherResultDetailDtoJf);
         }
+        if (all3.compareTo(BigDecimal.ZERO) > 0) {
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+            if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
+                voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
+            }
+            voucherResultDetailDtoJf.setSubjectNo(payType);
+            voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
+            voucherResultDetailDtoJf.setDebit(String.valueOf(all3));
+            list3.add(voucherResultDetailDtoJf);
+        }
 
-        if (!list.isEmpty()) {
+        if (all4.compareTo(BigDecimal.ZERO) > 0) {
+            Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+            if (StringUtils.isNotBlank(finalConfirmation.getCollectionBankNum())) {
+                voucherResultDetailDtoJf.setBankAccount(finalConfirmation.getCollectionBankNum());
+            }
+            voucherResultDetailDtoJf.setSubjectNo(payType);
+            voucherResultDetailDtoJf.setSummary("收款" +finalConfirmation.getPayerName()+ "（" + collectionDate + "）");
+            voucherResultDetailDtoJf.setDebit(String.valueOf(all3));
+            list4.add(voucherResultDetailDtoJf);
+        }
+
+
+        if (!list.isEmpty()) {//赎回收款（风控状态赎回中以及交回推送）
             voucher.setResultDetails(list);
             finKingDeeFeignRest.saveVoucher(voucher);
         }
-        if (!list2.isEmpty()) {
+        if (!list2.isEmpty()) {//二次销售收款
             voucher.setResultDetails(list2);
             finKingDeeFeignRest.saveVoucher(voucher);
         }
+        if(!list3.isEmpty()){//诉讼后法院认款
+            voucher.setResultDetails(list3);
+            finKingDeeFeignRest.saveVoucher(voucher);
+        }
 
+        if(!list4.isEmpty()){//执行后法院认款
+            voucher.setResultDetails(list4);
+            finKingDeeFeignRest.saveVoucher(voucher);
+        }
     }
 
     private List<Voucher.VoucherResultDetailDto> getAll(FinCollectionConfirmation finalConfirmation, FinSelectedReceivablesDetailedVo v, String collectionDate) {