From 290b7387d454332fbff37080edde50002491cacd Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 31 Mar 2023 16:52:03 +0800 Subject: [PATCH 1/3] //credit_score_rules --- .../com/iformall/controller/mem/WxScoreRulesController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index cfc374b21..fc0a3dd23 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -158,9 +158,6 @@ public class WxScoreRulesController extends BaseController { if(lockedEnum == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - if(wxMallService.isgroupSupport(getUser())){ - return new ResultData(ErrorCode.SYS_AUTH_ERROR); - } if(!getUser().getTenantId().equals(getTenantInfo().getTenantId())){ return new ResultData(ErrorCode.SYS_AUTH_ERROR); } From ba85a1e321ed8cad2f598238c377dbd76ed40321 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 31 Mar 2023 17:16:18 +0800 Subject: [PATCH 2/3] //credit_score_rules --- .../com/iformall/service/impl/WxScoreRulesServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 2304a6086..8095f05f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -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()); @@ -222,7 +222,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public WxScoreRules getCreditRules(TenantEntity tenantEntity) { WxScoreRules scoreRules = null; WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); - if(EnumMallDispose.MALL.equals(mallDispose.getPointsDispose())){ + if(EnumMallDispose.MALL.getCode().equals(mallDispose.getPointsDispose())){ scoreRules = this.getCreditRules(tenantEntity.getTenantId()); }else{ scoreRules = this.getCreditRules(tenantEntity.getFinalTenantId()); From 9a43e44a8b92c7b205a6fc5c3a77dd5d9593c685 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 3 Apr 2023 11:37:59 +0800 Subject: [PATCH 3/3] //credit_score_rules --- .../service/impl/WxScoreRulesServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 8095f05f2..7e7a632a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -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,6 +222,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { public WxScoreRules getCreditRules(TenantEntity tenantEntity) { WxScoreRules scoreRules = null; WxMallDispose mallDispose = wxMallDisposeService.getMallDispose(tenantEntity); + logger.info("WxMallDispose >>"+JSONObject.toJSONString(mallDispose)); if(EnumMallDispose.MALL.getCode().equals(mallDispose.getPointsDispose())){ scoreRules = this.getCreditRules(tenantEntity.getTenantId()); }else{ @@ -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; }