From 61d7dde8a475065a878f91e3adfd690c6199efdf Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 11 Sep 2024 18:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/kingdee/voucher/PaymentVoucher.java | 2 ++ .../FinPaymentrecordService.java | 6 +++- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 26 +++++++++++---- .../loansettleapply/LoanSettleApplyFeign.java | 6 +++- .../loansettleapply/LoanSettleApplyRest.java | 8 ++--- .../LoanSettleApplyService.java | 32 +++++++++++++------ 6 files changed, 59 insertions(+), 21 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java index 260140ce7a..89e80568fd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java @@ -52,6 +52,8 @@ public class PaymentVoucher { public BigDecimal relief; @ApiModelProperty("结清时未到期利息不减免") public BigDecimal noRelief; + @ApiModelProperty("付款时手续费") + public BigDecimal paymentCharges; @ApiModelProperty("备注") public String remarks; @ApiModelProperty("借贷方类型") 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 459538a0cf..c0987ad5fb 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 @@ -539,13 +539,17 @@ public class FinPaymentrecordService extends MybatisBaseService 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) { Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方 dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免"); dto2.setSubjectNo("6002.01.17"); dto2.setDimensionDept(voucherDetail.getDeptCode()); - dto2.setDebit(String.valueOf(voucherDetail.getNoRelief())); + dto2.setCredit(String.valueOf(voucherDetail.getNoRelief())); resultDetails.add(dto2); } if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) { @@ -823,7 +830,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto3.setSubjectNo("1201.01.00"); dto3.setDimensionDept(voucherDetail.getDeptCode()); dto1.setDimensionCustom(voucherDetail.getCustomerCode()); - dto3.setDebit(String.valueOf(voucherDetail.getRelief())); + dto3.setCredit(String.valueOf(voucherDetail.getRelief())); resultDetails.add(dto3); } Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 @@ -851,12 +858,19 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { 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) { Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方 dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免"); dto2.setSubjectNo("6002.01.17"); dto2.setDimensionDept(voucherDetail.getDeptCode()); - dto2.setDebit(String.valueOf(voucherDetail.getNoRelief())); + dto2.setCredit(String.valueOf(voucherDetail.getNoRelief())); resultDetails.add(dto2); } if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) > 0) { @@ -864,8 +878,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免"); dto3.setSubjectNo("1201.01.00"); dto3.setDimensionDept(voucherDetail.getDeptCode()); - dto1.setDimensionCustom(voucherDetail.getCustomerCode()); - dto3.setDebit(String.valueOf(voucherDetail.getRelief())); + dto3.setDimensionCustom(voucherDetail.getCustomerCode()); + dto3.setCredit(String.valueOf(voucherDetail.getRelief())); resultDetails.add(dto3); } Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方 @@ -876,7 +890,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto4.setSubjectNo("1002.02.01"); } dto4.setBankAccount(voucher.getBankAccount()); - dto4.setCredit(String.valueOf(voucherDetail.getAmount())); + dto4.setCredit(String.valueOf(voucherDetail.getBalance())); resultDetails.add(dto4); } } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java index f3c0203939..dbef121336 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyFeign.java @@ -104,7 +104,11 @@ public interface LoanSettleApplyFeign { @ApiOperation(value = "推送资方结清款凭证") @PostMapping(value = "/pushBankVoucher") - ResultBean pushBankVoucher(@RequestParam("sid") String sid,@RequestParam("accountNumber") String accountNumber,@RequestParam("payTypeCode") String payTypeCode); + ResultBean pushBankVoucher(@RequestParam("sid") String sid, + @RequestParam("accountNumber") String accountNumber, + @RequestParam("payTypeCode") String payTypeCode, + @RequestParam("shouxufei") String shouxufei + ); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java index acafaa30b0..3fec280ca7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java @@ -120,12 +120,12 @@ public class LoanSettleApplyRest implements LoanSettleApplyFeign { } @Override - public ResultBean getFinSettleVo(String busVinSid, String receivablesName,String subscriptionMoney) { - return loanSettleApplyService.getFinSettleVo(busVinSid,receivablesName,subscriptionMoney); + public ResultBean getFinSettleVo(String busVinSid, String receivablesName, String subscriptionMoney) { + return loanSettleApplyService.getFinSettleVo(busVinSid, receivablesName, subscriptionMoney); } @Override - public ResultBean pushBankVoucher(String sid, String accountNumber, String payTypeCode) { - return loanSettleApplyService.pushBankVoucher(sid,accountNumber,payTypeCode); + public ResultBean pushBankVoucher(String sid, String accountNumber, String payTypeCode, String shouxufei) { + return loanSettleApplyService.pushBankVoucher(sid, accountNumber, payTypeCode,shouxufei); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java index 71ac0857bf..a007131867 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java @@ -731,7 +731,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36")); + } boolean isTure = false; boolean isTure2 = false; if (jmRate.compareTo(rate1) < 0) { @@ -871,7 +873,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36")); + } boolean isTure = false; boolean isTure2 = false; if (jmRate.compareTo(rate1) < 0) { @@ -1685,6 +1689,7 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); @@ -1736,13 +1742,13 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + if (bzjKFCw.compareTo(BigDecimal.ZERO) > 0) { GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); voucherDetail.setSceneCode("贷款保证金扣罚"); voucherDetail.setBankName(planDetails.getBankName()); voucherDetail.setDeptCode(deptCode); voucherDetail.setCustomerCode(customerNumber); - voucherDetail.setAmount(bzjKF); + voucherDetail.setAmount(bzjKFCw); voucherDetails.add(voucherDetail); } //资方结清款付款 @@ -2394,7 +2400,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36")); + } boolean isTure = false; boolean isTure2 = false; if (jmRate.compareTo(rate1) < 0) { @@ -2438,7 +2446,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36")); + } boolean isTure = false; boolean isTure2 = false; if (jmRate.compareTo(rate1) < 0) { @@ -2495,7 +2505,9 @@ public class LoanSettleApplyService extends MybatisBaseService 0) { + jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36")); + } boolean isTure = false; boolean isTure2 = false; if (jmRate.compareTo(rate1) < 0) { @@ -3264,7 +3276,7 @@ public class LoanSettleApplyService extends MybatisBaseService