修改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -4798,7 +4798,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 } else {
                     customerNumber = busSalesOrderVehicle.getTemporaryNo();
                 }
-                if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "11".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
+                if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString()) || "6".equals(busSalesOrderVehicle.getRiskState().toString())) {//赎回中-赎回凭证--交回--转租中
                     ////营业费用_催收费用 上门催收费用--收回车辆费用（赎回通过后推送的费用）
                     if ("4".equals(busSalesOrderVehicle.getRiskState().toString()) || "1".equals(busSalesOrderVehicle.getRiskState().toString())){
                         if ("收回车辆费用".equals(v.getReceivablesName())) {
@@ -5243,6 +5243,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
                         voucherResultDetailDtoDf2.setCredit(v.getSubscriptionMoney());
                         list2.add(voucherResultDetailDtoDf2);
+                        //----资金占有费转收入
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoJf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoJf.setSubjectNo("2191.05.00");
+                        //核算部门
+                        voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoJf.setDebit(v.getSubscriptionMoney());
+                        list2.add(voucherResultDetailDtoJf);
+                        //----资金占有费转收入
+                        Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
+                        voucherResultDetailDtoDf.setSummary("资金占用费转收入");
+                        voucherResultDetailDtoDf.setSubjectNo("6002.01.19");
+                        //核算部门
+                        voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
+                        //核算客户
+                        voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
+                        voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
+                        list2.add(voucherResultDetailDtoDf);
                     }
 
                     if ("预计资方结清费用".equals(v.getReceivablesName())) {