From 1d42c583da61ecd108cf38f32aec848db64c1e87 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 13 Mar 2025 08:55:12 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E5=88=86=E6=B6=A6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEService=E5=88=A0=E9=99=A4=E7=BC=93=E5=AD=98=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/StationSplitConfigService.java    |  4 ++++
 .../impl/StationSplitConfigServiceImpl.java   | 21 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java
index 7123e5bd3..9f8648bcf 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/StationSplitConfigService.java
@@ -1,10 +1,12 @@
 package com.jsowell.pile.service;
 
+import com.jsowell.common.util.DateUtils;
 import com.jsowell.pile.domain.StationSplitConfig;
 import com.jsowell.pile.dto.SplitConfigDTO;
 import com.jsowell.pile.vo.web.ShareMemberVO;
 import com.jsowell.pile.vo.web.SplitConfigVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,6 +26,8 @@ public interface StationSplitConfigService {
      */
     List<StationSplitConfig> queryByStationIdWithInit(String stationId);
 
+    void deleteByMerchantIdAndStationId(String merchantId, String stationId, String userName, Date date);
+
     List<SplitConfigVO> querySplitConfigByStationId(String stationId);
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java
index 7f4ba35c1..93d99a4e6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java
@@ -59,6 +59,25 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
         return stationSplitConfigs;
     }
 
+
+    /**
+     * 通过merchantId stationId 删除缓存、数据库数据
+     * @param merchantId
+     * @param stationId
+     * @param userName
+     * @param date
+     */
+    @Override
+    public void deleteByMerchantIdAndStationId(String merchantId, String stationId, String userName, Date date) {
+        // 先删除缓存
+        String redisKey = CacheConstants.QUERY_STATION_SPLIT_CONFIG + stationId;
+        redisCache.deleteObject(redisKey);
+        // 删除数据库数据
+        stationSplitConfigMapper.deleteByMerchantIdAndStationId(merchantId, stationId, userName, date);
+        // 再次删除缓存数据
+        redisCache.deleteObject(redisKey);
+    }
+
     @Override
     public List<StationSplitConfig> queryByStationIdWithInit(String stationId) {
         // 查询站点分账配置
@@ -206,7 +225,7 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{
         }
         String userName = SecurityUtils.getLoginUser().getUsername();
         // 先删除该充电站的所有分成配置 逻辑删除
-        stationSplitConfigMapper.deleteByMerchantIdAndStationId(splitConfigDTO.getMerchantId(), splitConfigDTO.getStationId(), userName, DateUtils.getNowDate());
+        deleteByMerchantIdAndStationId(splitConfigDTO.getMerchantId(), splitConfigDTO.getStationId(), userName, DateUtils.getNowDate());
         // 保存到数据库
         List<StationSplitConfig> splitConfigList = Lists.newArrayList();
         Date nowDate = DateUtils.getNowDate();