From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Mon, 15 Jul 2019 11:35:45 +0000 (+0800)
Subject: refactor: 规范变量名
X-Git-Tag: 1.0.0^2~42
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=37f0fd1ec44ca481be5639c24219ac97b6c7c654;p=epayment%2Ffood_payapi.git

refactor: 规范变量名
---

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<String, String> getSourceTypeConfigBySourceType(String pattype) {
-    List<TSourceTypeConfig> list = sourceTypeConfigDao.getBySourceType(pattype);
+  @Cacheable(cacheNames = "dictionary_cache", key = "@tenantHolder.genKey('sourcetype_config', #sourceType)")
+  public Map<String, String> getSourceTypeConfigBySourceType(String sourceType) {
+    List<TSourceTypeConfig> list = sourceTypeConfigDao.getBySourceType(sourceType);
     Map<String, String> 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;
   }