From 51e7f44fe18ca9899bea2f4f5299c11c263977e8 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Tue, 30 Apr 2024 16:50:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=A1=E7=94=A8=E5=8D=A1?= =?UTF-8?q?=E5=88=86=E6=9C=9F=E8=AE=B0=E8=B4=A6=EF=BC=8C=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InstallmentHistoryDetailServiceImpl.java | 23 +++++++++++++++++ .../ruoyi/job/service/impl/InvestJobImpl.java | 25 ++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java index 43a24b5..f849491 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java @@ -128,6 +128,29 @@ public class InstallmentHistoryDetailServiceImpl implements IInstallmentHistoryD creditDeal.setCreateBy(SecurityUtils.getUsername()); creditDeal.setCreateTime(installmentHistoryDetail.getUpdateTime()); accountsDealRecordMapper.insertAccountsDealRecord(creditDeal); + + + //信用卡消费记录明细，应还本金 + AccountsDealRecord creditDealPrinciple=new AccountsDealRecord(); + creditDealPrinciple.setTransferRecordId(installmentHistoryDetail.getId()); + creditDealPrinciple.setAccountId(creditAccount.getAccountId()); + creditDealPrinciple.setId(IdWorker.getId()); + //支出金额 + creditDealPrinciple.setAmount(installmentHistoryDetail.getPrincipal()); + //实时余额 + creditDealPrinciple.setCurrentBalance(creditAccount.getBalance()); + //1储蓄卡，2 信用卡，3 网贷，4 人情，5 投资账户 + creditDealPrinciple.setType("2"); + //1 收入，2 支出，3 转账，4 借贷 + creditDealPrinciple.setDealType("2"); + //分期利息支出 + creditDealPrinciple.setDealCategory("10"); + creditDealPrinciple.setName(creditAccount.getName()+"（"+ StringUtils.getLastNumberChars(4,creditAccount.getCode()+"）")); + creditDealPrinciple.setRemark("应还本金"); + creditDealPrinciple.setCreateBy(SecurityUtils.getUsername()); + creditDealPrinciple.setCreateTime(installmentHistoryDetail.getUpdateTime()); + accountsDealRecordMapper.insertAccountsDealRecord(creditDealPrinciple); + } } //应还款金额=本金加利息 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java index 9cc93b4..039ec2f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java @@ -199,7 +199,8 @@ public class InvestJobImpl implements IInvestJobService creditAccount.setAvailableLimit(creditAccount.getBalance()+creditAccount.getCreditLimit()); creditAccount.setUpdateTime(installmentHistoryDetail.getUpdateTime()); accountsMapper.updateAccounts(creditAccount); - + //工行提前将利息额度占用，不再生成利息支出，一次性生成利息支出即可。 + if(!creditAccount.getName().contains("工商银行")){ //信用卡消费记录明细 AccountsDealRecord creditDeal=new AccountsDealRecord(); creditDeal.setTransferRecordId(installmentHistoryDetail.getId()); @@ -220,6 +221,28 @@ public class InvestJobImpl implements IInvestJobService creditDeal.setCreateBy(SecurityUtils.getUsername()); creditDeal.setCreateTime(installmentHistoryDetail.getUpdateTime()); accountsDealRecordMapper.insertAccountsDealRecord(creditDeal); + + } + //信用卡消费记录明细，应还本金 + AccountsDealRecord creditDealPrinciple=new AccountsDealRecord(); + creditDealPrinciple.setTransferRecordId(installmentHistoryDetail.getId()); + creditDealPrinciple.setAccountId(creditAccount.getAccountId()); + creditDealPrinciple.setId(IdWorker.getId()); + //支出金额 + creditDealPrinciple.setAmount(installmentHistoryDetail.getPrincipal()); + //实时余额 + creditDealPrinciple.setCurrentBalance(creditAccount.getBalance()); + //1储蓄卡，2 信用卡，3 网贷，4 人情，5 投资账户 + creditDealPrinciple.setType("2"); + //1 收入，2 支出，3 转账，4 借贷 + creditDealPrinciple.setDealType("2"); + //分期利息支出 + creditDealPrinciple.setDealCategory("10"); + creditDealPrinciple.setName(creditAccount.getName()+"（"+ StringUtils.getLastNumberChars(4,creditAccount.getCode()+"）")); + creditDealPrinciple.setRemark("应还本金"); + creditDealPrinciple.setCreateBy(SecurityUtils.getUsername()); + creditDealPrinciple.setCreateTime(installmentHistoryDetail.getUpdateTime()); + accountsDealRecordMapper.insertAccountsDealRecord(creditDealPrinciple); }