From aa398f53805f2d95cde097711a0d50a6306b120f Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 6 Feb 2025 14:34:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=81=AA=E8=AE=B0=E8=B4=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=9D=9E=E6=9F=9C=E9=9D=A2=E9=99=90?=
 =?UTF-8?q?=E9=A2=9D=E8=B0=83=E6=95=B4bug=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invest/mapper/BankCardLimitHistoryMapper.java     | 11 ++++++++++-
 .../service/impl/BankCardLimitHistoryServiceImpl.java |  9 +++++++++
 .../mapper/invest/BankCardLimitHistoryMapper.xml      |  9 +++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/BankCardLimitHistoryMapper.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/BankCardLimitHistoryMapper.java
index 5d0c7a0..1be44f1 100644
--- a/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/BankCardLimitHistoryMapper.java
+++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/BankCardLimitHistoryMapper.java
@@ -1,10 +1,11 @@
 package com.intc.invest.mapper;
 
-import java.util.List;
 import com.intc.invest.domain.BankCardLimitHistory;
 import com.intc.invest.domain.dto.BankCardLimitHistoryDto;
 import com.intc.invest.domain.vo.BankCardLimitHistoryVo;
 
+import java.util.List;
+
 /**
  * 银行卡额度调整历史记录Mapper接口
  *
@@ -76,4 +77,12 @@ public interface BankCardLimitHistoryMapper
      * @return 结果
      */
     public int removeBankCardLimitHistoryByIds(Long[] ids);
+
+    /**
+     * 查询银行卡额度调整历史记录
+     *
+     * @param id 银行卡额度调整历史记录主键
+     * @return 银行卡额度调整历史记录
+     */
+    public BankCardLimitHistoryVo selectRecentBankCardLimitHistoryById(Long id);
 }
diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/BankCardLimitHistoryServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/BankCardLimitHistoryServiceImpl.java
index 9799762..55b8aa0 100644
--- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/BankCardLimitHistoryServiceImpl.java
+++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/BankCardLimitHistoryServiceImpl.java
@@ -61,6 +61,15 @@ public class BankCardLimitHistoryServiceImpl implements IBankCardLimitHistorySer
         bankCardLimitHistory.setCreateBy(SecurityUtils.getUsername());
         bankCardLimitHistory.setCreateTime(DateUtils.getNowDate());
         bankCardLimitHistory.setId(IdWorker.getId());
+        //非柜面限额调整，取之前的数据
+        if(bankCardLimitHistory.getType().equals("3")){
+            BankCardLimitHistoryVo beforeHis=bankCardLimitHistoryMapper.selectRecentBankCardLimitHistoryById(bankCardLimitHistory.getBankCardLendId());
+            if(beforeHis!=null){
+                bankCardLimitHistory.setBeforeLimit(beforeHis.getAfterLimit());
+             }else {
+                bankCardLimitHistory.setBeforeLimit(0);
+             }
+        }
         bankCardLimitHistory.setAdjustLimit(bankCardLimitHistory.getAfterLimit()-bankCardLimitHistory.getBeforeLimit());
         return bankCardLimitHistoryMapper.insertBankCardLimitHistory(bankCardLimitHistory);
     }
diff --git a/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml
index d9fb7bc..08626c3 100644
--- a/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml
+++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml
@@ -136,4 +136,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+
+    <select id="selectRecentBankCardLimitHistoryById" parameterType="Long" resultMap="BankCardLimitHistoryResult">
+        <include refid="selectBankCardLimitHistoryVo"/>
+        where a.del_flag='0'
+       and  a.bank_card_lend_id = #{id}
+        order by a.create_time desc
+        limit 1
+    </select>
+
 </mapper>