diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java index 08cf247..3742625 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java @@ -79,4 +79,12 @@ public interface InstallmentHistoryMapper * @return 结果 */ public int removeInstallmentHistoryByIds(Long[] ids); + + /** + * 批量删除网贷及分期历史 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteInstallmentHistoryDetailByIds(Long[] ids); } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java index 9f5d004..83bd65c 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -531,7 +531,10 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor //储蓄卡 BankCardLendVo debitCardVo=bankCardLendMapper.selectBankCardLendById(accountsTransferRecord.getInAccountId()); - //实际入账金额 + //如果是借款,利息为0, + if(accountsTransferRecord.getCommission()==null){ + accountsTransferRecord.setCommission(0D); + } accountsTransferRecord.setActualAmount(accountsTransferRecord.getAmount()+accountsTransferRecord.getCommission()); //借贷余额计算 AccountsVo lendAccount=accountsMapper.selectAccountsById(lendVo.getId()); diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java index 1139d46..6b883a0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java @@ -235,6 +235,8 @@ public class InstallmentHistoryServiceImpl implements IInstallmentHistoryService @Override public int deleteInstallmentHistoryByIds(Long[] ids) { + //先删除明细,再删除主表 + installmentHistoryMapper.deleteInstallmentHistoryDetailByIds(ids); return installmentHistoryMapper.removeInstallmentHistoryByIds(ids); } diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml index 6ec9111..6182cd2 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml @@ -51,12 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" installment_history_detail a left join bank_card_lend bcl on bcl.id = a.bank_card_lend_id + left join installment_history ih on ih.id=a.installment_history_id