From 0d69782a74862592b6f034b2fa3549b6d28d787a Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 25 Feb 2025 11:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=B9=E7=BB=93?= =?UTF-8?q?=E6=B8=85=E4=BB=98=E6=AC=BE=E5=87=BA=E7=BA=B3=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=87=AD=E8=AF=81=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationFeign.java | 2 +- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 107 ++++++++++-------- 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 6a8b3b74fa..e7d30a0c86 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -118,7 +118,7 @@ public interface FinCollectionConfirmationFeign { @PostMapping("/selectSids") ResultBean> selectSids(@RequestParam("busVehSid") String busVehSid); - /*-------------------------------------------------------------------------*/ + /*-----------------------------售后认款申请--------------------------------------------*/ @ApiOperation("售后提交新增保存") @PostMapping("/asSave") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 6e0ec95e01..f459056e4f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -1656,21 +1656,23 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { bankCode = dictCommonVo.getDictValue(); } if (voucherDetail.getSceneCode().equals(SceneCodeEnum.settle_VOUCHER1.getCode())) { - Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 - dto1.setSummary(voucherDetail.getBankName() + "结清"); - dto1.setSubjectNo(bankCode); - dto1.setDimensionDept(voucherDetail.getDeptCode()); - dto1.setDimensionCustom(voucherDetail.getCustomerCode()); - dto1.setDebit(String.valueOf(voucherDetail.getAmount())); - resultDetails.add(dto1); - if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) != 0) { + Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 + dto1.setSummary(voucherDetail.getBankName() + "结清"); + dto1.setSubjectNo(bankCode); + dto1.setDimensionDept(voucherDetail.getDeptCode()); + dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setDebit(String.valueOf(voucherDetail.getAmount())); + resultDetails.add(dto1); + } + if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto0 = new Voucher.VoucherResultDetailDto(); //借方 dto0.setSummary("付款手续费"); dto0.setSubjectNo("6603.03.00"); dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges())); resultDetails.add(dto0); } - if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方 dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免"); dto2.setSubjectNo("6002.01.17"); @@ -1678,49 +1680,58 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto2.setCredit(String.valueOf(voucherDetail.getNoRelief())); resultDetails.add(dto2); } - if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方 dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免"); dto3.setSubjectNo("1201.01.00"); dto3.setDimensionDept(voucherDetail.getDeptCode()); - dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto3.setDimensionCustom(voucherDetail.getCustomerCode()); dto3.setCredit(String.valueOf(voucherDetail.getRelief())); resultDetails.add(dto3); } - Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 - dto4.setSummary(voucherDetail.getBankName() + "个贷保证金抵结清款"); - dto4.setSubjectNo("1009.01.00"); - dto4.setDimensionDept(voucherDetail.getDeptCode()); - dto4.setDimensionCustom(voucherDetail.getCustomerCode()); - dto4.setBank("342"); - dto4.setCredit(String.valueOf(voucherDetail.getSubtrahend())); - resultDetails.add(dto4); - Voucher.VoucherResultDetailDto dto5 = new Voucher.VoucherResultDetailDto(); //贷方 - dto5.setSummary(voucherDetail.getBankName() + "结清"); - if (voucher.getPayTypeCode().equals("02")) { - dto5.setSubjectNo("1002.01.00"); - } else if (voucher.getPayTypeCode().equals("01")) { - dto5.setSubjectNo("1002.02.01"); + if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) { + Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 + dto4.setSummary(voucherDetail.getBankName() + "个贷保证金抵结清款"); + dto4.setSubjectNo("1009.01.00"); + dto4.setDimensionDept(voucherDetail.getDeptCode()); + dto4.setDimensionCustom(voucherDetail.getCustomerCode()); + dto4.setBank("342"); + dto4.setCredit(String.valueOf(voucherDetail.getSubtrahend())); + resultDetails.add(dto4); + } + + if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) { + Voucher.VoucherResultDetailDto dto5 = new Voucher.VoucherResultDetailDto(); //贷方 + dto5.setSummary(voucherDetail.getBankName() + "结清"); + if (voucher.getPayTypeCode().equals("02")) { + dto5.setSubjectNo("1002.01.00"); + } else if (voucher.getPayTypeCode().equals("01")) { + dto5.setSubjectNo("1002.02.01"); + } + dto5.setBankAccount(voucher.getBankAccount()); + dto5.setCredit(String.valueOf(voucherDetail.getBalance())); + resultDetails.add(dto5); } - dto5.setBankAccount(voucher.getBankAccount()); - dto5.setCredit(String.valueOf(voucherDetail.getBalance())); - resultDetails.add(dto5); + } else { - Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 - dto1.setSummary(voucherDetail.getBankName() + "结清"); - dto1.setSubjectNo(bankCode); - dto1.setDimensionDept(voucherDetail.getDeptCode()); - dto1.setDimensionCustom(voucherDetail.getCustomerCode()); - dto1.setDebit(String.valueOf(voucherDetail.getAmount())); - resultDetails.add(dto1); - if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getAmount().compareTo(BigDecimal.ZERO) != 0) { + Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方 + dto1.setSummary(voucherDetail.getBankName() + "结清"); + dto1.setSubjectNo(bankCode); + dto1.setDimensionDept(voucherDetail.getDeptCode()); + dto1.setDimensionCustom(voucherDetail.getCustomerCode()); + dto1.setDebit(String.valueOf(voucherDetail.getAmount())); + resultDetails.add(dto1); + } + + if (voucherDetail.getPaymentCharges().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto0 = new Voucher.VoucherResultDetailDto(); //借方 dto0.setSummary("付款手续费"); dto0.setSubjectNo("6603.03.00"); dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges())); resultDetails.add(dto0); } - if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方 dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免"); dto2.setSubjectNo("6002.01.17"); @@ -1728,7 +1739,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto2.setCredit(String.valueOf(voucherDetail.getNoRelief())); resultDetails.add(dto2); } - if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) { + if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) { Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方 dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免"); dto3.setSubjectNo("1201.01.00"); @@ -1737,16 +1748,18 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto3.setCredit(String.valueOf(voucherDetail.getRelief())); resultDetails.add(dto3); } - Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 - dto4.setSummary(voucherDetail.getBankName() + "结清"); - if (voucher.getPayTypeCode().equals("02")) { - dto4.setSubjectNo("1002.01.00"); - } else if (voucher.getPayTypeCode().equals("01")) { - dto4.setSubjectNo("1002.02.01"); + if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) { + Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 + dto4.setSummary(voucherDetail.getBankName() + "结清"); + if (voucher.getPayTypeCode().equals("02")) { + dto4.setSubjectNo("1002.01.00"); + } else if (voucher.getPayTypeCode().equals("01")) { + dto4.setSubjectNo("1002.02.01"); + } + dto4.setBankAccount(voucher.getBankAccount()); + dto4.setCredit(String.valueOf(voucherDetail.getBalance())); + resultDetails.add(dto4); } - dto4.setBankAccount(voucher.getBankAccount()); - dto4.setCredit(String.valueOf(voucherDetail.getBalance())); - resultDetails.add(dto4); } } newVoucher.setResultDetails(resultDetails);