Merge branch 'dev-zza' into dev

This commit is contained in:
Lemon
2025-03-13 08:56:34 +08:00
2 changed files with 24 additions and 1 deletions

View File

@@ -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();