From 91fad205b9fbac29b917d931fb1109f19d7ce0ad Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 5 Jul 2024 16:39:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=8F=91=E7=8E=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/invest/mapper/InstallmentHistoryMapper.java | 8 ++++++++
 .../service/impl/AccountsTransferRecordServiceImpl.java   | 5 ++++-
 .../service/impl/InstallmentHistoryServiceImpl.java       | 2 ++
 .../mapper/invest/InstallmentHistoryDetailMapper.xml      | 3 ++-
 .../resources/mapper/invest/InstallmentHistoryMapper.xml  | 7 +++++++
 5 files changed, 23 insertions(+), 2 deletions(-)

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
     </sql>
 
     <select id="selectInstallmentHistoryDetailList" parameterType="InstallmentHistoryDetailDto" resultMap="InstallmentHistoryDetailResult">
         <include refid="selectInstallmentHistoryDetailVo"/>
         <where>
-            a.del_flag='0'
+            a.del_flag='0' and ih.del_flag='0'
             <if test="installmentHistoryId != null "> and a.installment_history_id = #{installmentHistoryId}</if>
             <if test="bankCardLendId != null "> and a.bank_card_lend_id = #{bankCardLendId}</if>
             <if test="type != null  and type != ''"> and a.type = #{type}</if>
diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
index 62cf8bf..e32d898 100644
--- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
+++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml
@@ -239,4 +239,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+
+    <delete id="deleteInstallmentHistoryDetailByIds" parameterType="String">
+        delete from installment_history_detail where installment_history_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>