From 37f0fd1ec44ca481be5639c24219ac97b6c7c654 Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Mon, 15 Jul 2019 19:35:45 +0800 Subject: [PATCH] =?utf8?q?refactor:=20=E8=A7=84=E8=8C=83=E5=8F=98=E9=87=8F?= =?utf8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../service/impl/SourceTypeServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java index 20293723..57b9a017 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java @@ -31,7 +31,8 @@ public class SourceTypeServiceImpl implements SourceTypeService { private final ShopSourceTypeConfigDao shopSourceTypeConfigDao; @Autowired - public SourceTypeServiceImpl(SourceTypeDao sourceTypeDao, SourceTypeConfigDao sourceTypeConfigDao, ShopSourceTypeDao shopSourceTypeDao, ShopSourceTypeConfigDao shopSourceTypeConfigDao) { + public SourceTypeServiceImpl(SourceTypeDao sourceTypeDao, SourceTypeConfigDao sourceTypeConfigDao, + ShopSourceTypeDao shopSourceTypeDao, ShopSourceTypeConfigDao shopSourceTypeConfigDao) { this.sourceTypeDao = sourceTypeDao; this.sourceTypeConfigDao = sourceTypeConfigDao; this.shopSourceTypeDao = shopSourceTypeDao; @@ -40,18 +41,18 @@ public class SourceTypeServiceImpl implements SourceTypeService { @Override - @Cacheable(cacheNames = "dictionary_cache", keyGenerator = "tenantCacheKey") - public TSourceType getBySourceType(String paytype) { - return sourceTypeDao.getOne(paytype); + @Cacheable(cacheNames = "dictionary_cache", key = "@tenantHolder.genKey('sourcetype', #sourceType)") + public TSourceType getBySourceType(String sourceType) { + return sourceTypeDao.getOne(sourceType); } @Override - @Cacheable(cacheNames = "dictionary_cache", keyGenerator = "tenantCacheKey") - public Map getSourceTypeConfigBySourceType(String pattype) { - List list = sourceTypeConfigDao.getBySourceType(pattype); + @Cacheable(cacheNames = "dictionary_cache", key = "@tenantHolder.genKey('sourcetype_config', #sourceType)") + public Map getSourceTypeConfigBySourceType(String sourceType) { + List list = sourceTypeConfigDao.getBySourceType(sourceType); Map map = new HashMap<>(list.size()); - for (TSourceTypeConfig paytypeConfig : list) { - map.put(paytypeConfig.getConfigid(), paytypeConfig.getConfigValue()); + for (TSourceTypeConfig sourceTypeConfig : list) { + map.put(sourceTypeConfig.getConfigid(), sourceTypeConfig.getConfigValue()); } return map; } -- 2.17.1