diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 901d54bbc..23c8228c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -50,7 +50,9 @@ public class WxMallServiceImpl implements WxMallService { @Override public WxMall getById(Long id) { - String key = Constant.MALL_KEY_PREV + String.valueOf(id); + String key = getRedisKeyByTenantInfo(new TenantEntity(){{ + setTenantId(String.valueOf(id)); + }}); ValueOperations operations = mallRedisTemplate.opsForValue(); // 缓存 @@ -82,7 +84,7 @@ public class WxMallServiceImpl implements WxMallService { int ret = wxMallMapper.insert(record); - String key = Constant.MALL_KEY_PREV + String.valueOf(record.getId()); + String key = getRedisKeyByTenantInfo(record.getTenantInfo()); // 缓存已存在,删除 boolean hasKey = mallRedisTemplate.hasKey(key); if(hasKey) { @@ -96,7 +98,7 @@ public class WxMallServiceImpl implements WxMallService { public int update(WxMall record) { int ret = wxMallMapper.updateById(record); - String key = Constant.MALL_KEY_PREV + String.valueOf(record.getId()); + String key = getRedisKeyByTenantInfo(record.getTenantInfo()); // 缓存已存在,删除 boolean hasKey = mallRedisTemplate.hasKey(key); if(hasKey) { @@ -110,7 +112,9 @@ public class WxMallServiceImpl implements WxMallService { public void deleteById(Long id) { wxMallMapper.deleteById(id); - String key = Constant.MALL_KEY_PREV + String.valueOf(id); + String key = getRedisKeyByTenantInfo(new TenantEntity() {{ + setTenantId(String.valueOf(id)); + }}); // 缓存已存在,删除 boolean hasKey = mallRedisTemplate.hasKey(key); if(hasKey) { @@ -121,12 +125,7 @@ public class WxMallServiceImpl implements WxMallService { @Override public WxMall getByTenantInfo(TenantEntity tenantEntity) { - StringBuilder sb = new StringBuilder(); - sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); - if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { - sb.append("-").append(tenantEntity.getSubTenantId()); - } - String key = sb.toString(); + String key = getRedisKeyByTenantInfo(tenantEntity); ValueOperations operations = mallRedisTemplate.opsForValue(); // 缓存 @@ -195,7 +194,9 @@ public class WxMallServiceImpl implements WxMallService { @Override public WxMall getByTenantId(String id) { - String key = Constant.MALL_KEY_PREV + String.valueOf(id); + String key = getRedisKeyByTenantInfo(new TenantEntity() {{ + setTenantId(id); + }}); ValueOperations operations = mallRedisTemplate.opsForValue(); // 缓存 @@ -255,4 +256,13 @@ public class WxMallServiceImpl implements WxMallService { return mallList; } + private String getRedisKeyByTenantInfo(TenantEntity tenantEntity) { + StringBuilder sb = new StringBuilder(); + sb.append(Constant.TENANT_KEY_PREV).append(tenantEntity.getTenantId()); + if (StringUtils.isBlank(tenantEntity.getSubTenantId())) { + sb.append("-").append(tenantEntity.getSubTenantId()); + } + return sb.toString(); + } + }