From e63cd0493926363a694a6c387fe4ee77dff9d1a2 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期五, 03 七月 2026 12:42:09 +0800
Subject: [PATCH] feat: 放心行增加用户余额变更记录

---
 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java
index c4f3a2f..e36c2ae 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TravelCardServiceImpl.java
@@ -62,7 +62,7 @@
             travelCard.setRechargeTime(new Date());
             this.baseMapper.updateById(travelCard);
             // 新增余额变更记录(出行卡兑换类型)
-            this.baseMapper.insertBalanceModifyRecord(BalanceModifyRecordVo.convert(userInfo.getId(), userInfo.getNickName(), userInfo.getPhone(), travelCard.getAmount()));
+           //  this.baseMapper.insertBalanceModifyRecord(BalanceModifyRecordVo.convert(userInfo.getId(), userInfo.getNickName(), userInfo.getPhone(), travelCard.getAmount()));
         }
         return travelCard.getAmount();
     }
@@ -74,15 +74,21 @@
      * @return 变更记录列表
      */
     public List<BalanceRecordVo> getBalanceModifyRecord(Integer userId, Integer type, String startDate, String endDate) {
+        if(StringUtils.isNotEmpty(startDate)) {
+            startDate = startDate + " 00:00:00";
+        }
+        if(StringUtils.isNotEmpty(endDate)) {
+            endDate = endDate + " 23:59:59";
+        }
         List<BalanceModifyRecordVo> recordVoList = this.baseMapper.getBalanceModifyRecord(userId, type, startDate, endDate);
-        List<BalanceRecordVo> orderRecords = this.baseMapper.getOrderRecord(userId, startDate, endDate);
+        // List<BalanceRecordVo> orderRecords = this.baseMapper.getOrderRecord(userId, startDate, endDate);
         List<BalanceRecordVo> balanceRecordVos = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(recordVoList)) {
             recordVoList.forEach(r -> balanceRecordVos.add(BalanceRecordVo.convert(r)));
         }
-        if(CollectionUtils.isNotEmpty(orderRecords)) {
+       /* if(CollectionUtils.isNotEmpty(orderRecords)) {
             orderRecords.forEach(order -> balanceRecordVos.add(BalanceRecordVo.convert(order, userId)));
-        }
+        }*/
         return balanceRecordVos;
     }
 

--
Gitblit v1.7.1