From e794486f53a554d62a660a3ea1ee18ce0907c7da Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 19 Jan 2021 16:07:51 +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 --- .../src/main/java/com/iformall/utils/CreditUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java index afec8cd76..79cb78357 100644 --- a/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/CreditUtil.java @@ -147,6 +147,10 @@ public class CreditUtil { WxScoreRules rules = wxScoreRulesService.getCreditDoubleRules(tenantId); if (Objects.nonNull(rules) && Objects.nonNull(rules.getRules())) { + Date date = new Date(); + int weekDay = DateUtils.getWeekOfDate(date); + int monthDay = DateUtils.getMonthOfDate(date); + int month = DateUtils.getMonth(date); //会员日积分规则 List ruleList = JSONObject.parseArray(rules.getRules(), JSONObject.class); for (JSONObject rule:ruleList) { @@ -162,7 +166,6 @@ public class CreditUtil { try { int start = Integer.parseInt(cycleStart); int end = Integer.parseInt(cycleEnd); - int weekDay = DateUtils.getWeekOfDate(new Date()); if(weekDay >= start && weekDay <=end){ memberDayScale = cycleScale; } @@ -173,7 +176,6 @@ public class CreditUtil { try { int start = Integer.parseInt(cycleStart); int end = Integer.parseInt(cycleEnd); - int monthDay = DateUtils.getMonthOfDate(new Date()); if(monthDay >= start && monthDay <=end){ memberDayScale = cycleScale; } @@ -185,11 +187,9 @@ public class CreditUtil { if(cycleStart.contains("-") && cycleEnd.contains("-")){ String[] cycleStarts = cycleStart.split("-"); String[] cycleEnds = cycleEnd.split("-"); - int month = DateUtils.getMonth(new Date()); int monthStart = Integer.parseInt(cycleStarts[0]); int monthEnd = Integer.parseInt(cycleEnds[0]); if(month >= monthStart && month <= monthEnd){ - int monthDay = DateUtils.getMonthOfDate(new Date()); int dayStart = Integer.parseInt(cycleStarts[1]); int dayEnd = Integer.parseInt(cycleEnds[1]); if(monthDay >= dayStart && monthDay <= dayEnd){