|
|
|
@@ -124,7 +124,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
public WxScoreRules getScoreRules(TenantEntity tenantEntity) { |
|
|
|
WxScoreRules scoreRules = null; |
|
|
|
WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); |
|
|
|
if(EnumMallDispose.MALL.equals(mallDispose.getGrowthValueDispose())){ |
|
|
|
if(EnumMallDispose.MALL.getCode().equals(mallDispose.getGrowthValueDispose())){ |
|
|
|
scoreRules = this.getScoreRules(tenantEntity.getTenantId()); |
|
|
|
}else{ |
|
|
|
scoreRules = this.getScoreRules(tenantEntity.getFinalTenantId()); |
|
|
|
@@ -189,7 +189,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
// 缓存存在 |
|
|
|
if (scoreRulesRedisTemplate.hasKey(key)) { |
|
|
|
WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); |
|
|
|
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了积分值设置 >> " + wScoreRules.toString()); |
|
|
|
logger.info("从缓存中获取了积分值设置 >> "+tenantId+">>"+ wScoreRules.toString()); |
|
|
|
return wScoreRules; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -213,7 +213,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
|
|
|
|
// 插入缓存 |
|
|
|
scoreRulesRedisTemplate.opsForValue().set(key, scoreRules); |
|
|
|
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 积分设置插入缓存 >> " + scoreRules.toString()); |
|
|
|
logger.info("getScoreRules() : 积分设置插入缓存 >> " +tenantId+">>"+ scoreRules.toString()); |
|
|
|
|
|
|
|
return scoreRules; |
|
|
|
} |
|
|
|
@@ -222,7 +222,8 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
public WxScoreRules getCreditRules(TenantEntity tenantEntity) { |
|
|
|
WxScoreRules scoreRules = null; |
|
|
|
WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); |
|
|
|
if(EnumMallDispose.MALL.equals(mallDispose.getPointsDispose())){ |
|
|
|
logger.info("WxMallDispose >>"+JSONObject.toJSONString(mallDispose)); |
|
|
|
if(EnumMallDispose.MALL.getCode().equals(mallDispose.getPointsDispose())){ |
|
|
|
scoreRules = this.getCreditRules(tenantEntity.getTenantId()); |
|
|
|
}else{ |
|
|
|
scoreRules = this.getCreditRules(tenantEntity.getFinalTenantId()); |
|
|
|
@@ -252,7 +253,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); |
|
|
|
if (hasKey) { |
|
|
|
scoreRulesRedisTemplate.delete(key); |
|
|
|
logger.info("WxScoreRulesServiceImpl.saveOrUpdate() : 从缓存中删除成长值设置 >> " + record.toString()); |
|
|
|
logger.info("从缓存中删除成长值设置 >> " +record.getTenantId()+">>"+ record.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (record != null && record.getType().equals(EnumScoreRules.CREDIT.getCode())) { |
|
|
|
@@ -261,7 +262,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); |
|
|
|
if (hasKey) { |
|
|
|
scoreRulesRedisTemplate.delete(key); |
|
|
|
logger.info("WxScoreRulesServiceImpl.saveOrUpdate() : 从缓存中删除积分设置 >> " + record.toString()); |
|
|
|
logger.info("从缓存中删除积分设置 >> " +record.getTenantId()+">>"+ record.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (record != null && record.getType().equals(EnumScoreRules.CREDIT_DOUBLE.getCode())) { |
|
|
|
@@ -270,7 +271,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); |
|
|
|
if (hasKey) { |
|
|
|
scoreRulesRedisTemplate.delete(key); |
|
|
|
logger.info("WxScoreRulesServiceImpl.saveOrUpdate() : 从缓存中删除积分设置 >> " + record.toString()); |
|
|
|
logger.info("从缓存中删除积分设置 >> " +record.getTenantId()+">>"+ record.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -704,7 +705,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
// 缓存存在 |
|
|
|
if (scoreRulesRedisTemplate.hasKey(key)) { |
|
|
|
WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); |
|
|
|
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了积分倍率设置 >> " + wScoreRules.toString()); |
|
|
|
logger.info("从缓存中获取了积分倍率设置 >> " +tenantId+">>"+ wScoreRules.toString()); |
|
|
|
return wScoreRules; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -723,7 +724,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { |
|
|
|
} |
|
|
|
// 插入缓存 |
|
|
|
scoreRulesRedisTemplate.opsForValue().set(key, scoreRules); |
|
|
|
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 积分设置插入缓存 >> " + scoreRules.toString()); |
|
|
|
logger.info("积分倍率设置插入缓存 >> " +tenantId+">>"+ scoreRules.toString()); |
|
|
|
return scoreRules; |
|
|
|
} |
|
|
|
|
|
|
|
|