diff --git a/Framework/YLErp.Cache/YLRedisCache.cs b/Framework/YLErp.Cache/YLRedisCache.cs index a927f107..c54c3d10 100644 --- a/Framework/YLErp.Cache/YLRedisCache.cs +++ b/Framework/YLErp.Cache/YLRedisCache.cs @@ -197,7 +197,7 @@ namespace YLErp.Cache foreach (var endpoint in endpoints) { var server = _redisConnector.GetServer(endpoint); - var keys = server.Keys(pattern: patterns); + var keys = server.Keys(db.Database, pattern: patterns); // 逐键删除(规避跨槽位) foreach (var key in keys) { diff --git a/YLErpDAL/Modules/MarginModule/ClientMarginConfigService.cs b/YLErpDAL/Modules/MarginModule/ClientMarginConfigService.cs index 370e1b51..b48cf1b8 100644 --- a/YLErpDAL/Modules/MarginModule/ClientMarginConfigService.cs +++ b/YLErpDAL/Modules/MarginModule/ClientMarginConfigService.cs @@ -151,8 +151,8 @@ namespace YLErp.Modules.MarginModule if (ylCache != null) { var cachePattern = config.client_id == 0 - ? "Otc:ClientMarginRate:*" - : $"Otc:ClientMarginRate:{config.client_id}:*"; + ? "ClientMarginRate:*" + : $"ClientMarginRate:{config.client_id}:*"; ylCache.BatchDelete(cachePattern); } } diff --git a/YLErpWeb/Controllers/ClientMarginConfigController.cs b/YLErpWeb/Controllers/ClientMarginConfigController.cs index 919be706..a610c424 100644 --- a/YLErpWeb/Controllers/ClientMarginConfigController.cs +++ b/YLErpWeb/Controllers/ClientMarginConfigController.cs @@ -99,10 +99,12 @@ namespace YLErp.Web.Controllers // 删除主记录 yldb.clientMarginConfig.Remove(marginConfig); yldb.SaveChanges(); - if (_cache!=null) + if (_cache != null) { - // 删除缓存ClientMarginRate开头的key - _cache.BatchDelete("Otc:ClientMarginRate:*"); + var cachePattern = marginConfig.client_id == 0 + ? "ClientMarginRate:*" + : $"ClientMarginRate:{marginConfig.client_id}:*"; + _cache.BatchDelete(cachePattern); } return JsonSuccess("已删除"); } @@ -163,11 +165,6 @@ namespace YLErp.Web.Controllers } new ClientMarginConfigService(CurUser).SaveMarginConfigWithDetails(marginConfig, detailEntities); - if (_cache != null) - { - // 删除缓存ClientMarginRate开头的key - _cache.BatchDelete("Otc:ClientMarginRate:*"); - } return JsonSuccess("已修改"); }