From c53b41bf9256c9d7593713057ffbaa856f3fd0ec Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 20 Jan 2021 16:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=80=8D=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/mem/WxScoreRulesController.java | 3 +++ .../src/main/java/com/iformall/utils/CreditUtil.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 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 d08859336..94f1759fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -88,6 +88,9 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "积分-配置") public ResultData creditDoubleRulesList() { logger.debug("[" + getIpAddr() + "] creditDoubleRulesList::list"); + if(StringUtils.isBlank(getTenantInfo().getTenantId())){ + return new ResultData(ErrorCode.USER_NO_PERMISSION,"集团版无此权限"); + } WxScoreRules scoreRules = wxScoreRulesService.getCreditDoubleRules(getTenantInfo().getTenantId()); return new ResultData(scoreRules); } diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index 508ce5053..18b153e26 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -202,9 +202,13 @@ public class CreditUtil { if(month >= monthStart && month <= monthEnd){ int dayStart = Integer.parseInt(cycleStarts[1]); int dayEnd = Integer.parseInt(cycleEnds[1]); - if(monthDay >= dayStart && monthDay <= dayEnd){ - memberDayScale = cycleScale; + if(month == monthStart && monthDay < dayStart){ + break; } + if(month == monthEnd && monthDay > dayEnd){ + break; + } + memberDayScale = cycleScale; } } } catch (NumberFormatException e) {