Sfoglia il codice sorgente

Merge branch 'release_toaliyun_real_20230403' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230403

release_toaliyun_real
lin 3 anni fa
parent
commit
af6246e2f5
2 ha cambiato i file con 10 aggiunte e 12 eliminazioni
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java
  2. +10
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java Vedi File

@@ -158,9 +158,6 @@ public class WxScoreRulesController extends BaseController {
if(lockedEnum == null){ if(lockedEnum == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }
if(wxMallService.isgroupSupport(getUser())){
return new ResultData(ErrorCode.SYS_AUTH_ERROR);
}
if(!getUser().getTenantId().equals(getTenantInfo().getTenantId())){ if(!getUser().getTenantId().equals(getTenantInfo().getTenantId())){
return new ResultData(ErrorCode.SYS_AUTH_ERROR); return new ResultData(ErrorCode.SYS_AUTH_ERROR);
} }


+ 10
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java Vedi File

@@ -124,7 +124,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
public WxScoreRules getScoreRules(TenantEntity tenantEntity) { public WxScoreRules getScoreRules(TenantEntity tenantEntity) {
WxScoreRules scoreRules = null; WxScoreRules scoreRules = null;
WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity);
if(EnumMallDispose.MALL.equals(mallDispose.getGrowthValueDispose())){
if(EnumMallDispose.MALL.getCode().equals(mallDispose.getGrowthValueDispose())){
scoreRules = this.getScoreRules(tenantEntity.getTenantId()); scoreRules = this.getScoreRules(tenantEntity.getTenantId());
}else{ }else{
scoreRules = this.getScoreRules(tenantEntity.getFinalTenantId()); scoreRules = this.getScoreRules(tenantEntity.getFinalTenantId());
@@ -189,7 +189,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
// 缓存存在 // 缓存存在
if (scoreRulesRedisTemplate.hasKey(key)) { if (scoreRulesRedisTemplate.hasKey(key)) {
WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key);
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了积分值设置 >> " + wScoreRules.toString());
logger.info("从缓存中获取了积分值设置 >> "+tenantId+">>"+ wScoreRules.toString());
return wScoreRules; return wScoreRules;
} }


@@ -213,7 +213,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {


// 插入缓存 // 插入缓存
scoreRulesRedisTemplate.opsForValue().set(key, scoreRules); scoreRulesRedisTemplate.opsForValue().set(key, scoreRules);
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 积分设置插入缓存 >> " + scoreRules.toString());
logger.info("getScoreRules() : 积分设置插入缓存 >> " +tenantId+">>"+ scoreRules.toString());


return scoreRules; return scoreRules;
} }
@@ -222,7 +222,8 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
public WxScoreRules getCreditRules(TenantEntity tenantEntity) { public WxScoreRules getCreditRules(TenantEntity tenantEntity) {
WxScoreRules scoreRules = null; WxScoreRules scoreRules = null;
WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); 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()); scoreRules = this.getCreditRules(tenantEntity.getTenantId());
}else{ }else{
scoreRules = this.getCreditRules(tenantEntity.getFinalTenantId()); scoreRules = this.getCreditRules(tenantEntity.getFinalTenantId());
@@ -252,7 +253,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); boolean hasKey = scoreRulesRedisTemplate.hasKey(key);
if (hasKey) { if (hasKey) {
scoreRulesRedisTemplate.delete(key); scoreRulesRedisTemplate.delete(key);
logger.info("WxScoreRulesServiceImpl.saveOrUpdate() : 从缓存中删除成长值设置 >> " + record.toString());
logger.info("从缓存中删除成长值设置 >> " +record.getTenantId()+">>"+ record.toString());
} }
} }
if (record != null && record.getType().equals(EnumScoreRules.CREDIT.getCode())) { if (record != null && record.getType().equals(EnumScoreRules.CREDIT.getCode())) {
@@ -261,7 +262,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); boolean hasKey = scoreRulesRedisTemplate.hasKey(key);
if (hasKey) { if (hasKey) {
scoreRulesRedisTemplate.delete(key); 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())) { if (record != null && record.getType().equals(EnumScoreRules.CREDIT_DOUBLE.getCode())) {
@@ -270,7 +271,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
boolean hasKey = scoreRulesRedisTemplate.hasKey(key); boolean hasKey = scoreRulesRedisTemplate.hasKey(key);
if (hasKey) { if (hasKey) {
scoreRulesRedisTemplate.delete(key); 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)) { if (scoreRulesRedisTemplate.hasKey(key)) {
WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key); WxScoreRules wScoreRules = scoreRulesRedisTemplate.opsForValue().get(key);
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 从缓存中获取了积分倍率设置 >> " + wScoreRules.toString());
logger.info("从缓存中获取了积分倍率设置 >> " +tenantId+">>"+ wScoreRules.toString());
return wScoreRules; return wScoreRules;
} }


@@ -723,7 +724,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService {
} }
// 插入缓存 // 插入缓存
scoreRulesRedisTemplate.opsForValue().set(key, scoreRules); scoreRulesRedisTemplate.opsForValue().set(key, scoreRules);
logger.info("WxScoreRulesServiceImpl.getScoreRules() : 积分设置插入缓存 >> " + scoreRules.toString());
logger.info("积分倍率设置插入缓存 >> " +tenantId+">>"+ scoreRules.toString());
return scoreRules; return scoreRules;
} }




Caricamento…
Annulla
Salva