From a9a15202c0d4c64f6156c111dd90f93ef009fe8e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:07:32 +0800
Subject: [PATCH] 12.18

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java |   12 ------------
 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml                  |    3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
index 5b2d63d..30e60fd 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java
@@ -62,18 +62,6 @@
         ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement();
         shopBalanceStatement.setType(1);
 
-        R<List<ShopBalanceStatement>> r;
-        try {
-            r = shopClient.getShopBalanceStatementList(shopBalanceStatement);
-        } catch (Exception e) {
-            log.error("获取店铺余额对账单列表时出错", e);
-            return null;
-        }
-
-        if (R.isError(r)) {
-            return null;
-        }
-
         List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord);
         List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>();
         for (BalanceChangeRecord changeRecord : balanceChangeRecordList) {
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
index f26c0ff..1c13ac5 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml
@@ -42,6 +42,9 @@
             <if test="changeRecord.startTime != null and changeRecord.endTime != null">
                 and (tbcr.create_time between  #{changeRecord.startTime} and #{changeRecord.endTime})
             </if>
+            <if test="changeRecord.changeType != null">
+                and tbcr.change_type = #{changeRecord.changeType}
+            </if>
         </where>
     </sql>
 

--
Gitblit v1.7.1