From fe77fd98e7646b00671a1b3aee0b61b1afbf53c5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 7 May 2019 14:57:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC=E8=A7=84=E5=88=99]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxScoreRules.java | 30 +++++++++---------- .../service/impl/WxScoreRulesServiceImpl.java | 13 ++++---- .../java/com/iformall/utils/Constant.java | 5 ++++ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java index 8bea2deef..83bf916df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreRules.java @@ -29,23 +29,23 @@ public class WxScoreRules implements Serializable { @Transient private static final String scoreDefaultRules = "[" + - "{\"id\":1,\"limit\":0,\"step\":1,\"score\":10 ,\"desc\":\"每日登陆\"}," + + "{\"id\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"每日登陆\"}," + "{\"id\":2,\"childs\":[" + - " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":3,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":4,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":5,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":7,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":8,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":9,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":10,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}," + - " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":50 ,\"desc\":\"线上交易1元\"}" + + " {\"businessId\":1,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":2,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":3,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":4,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":5,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":7,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":8,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":9,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":10,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}," + + " {\"businessId\":6,\"limit\":0,\"step\":1,\"score\":0 ,\"desc\":\"线上交易1元\"}" + "]}," + - "{\"id\":3,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"绑定车牌1个\"}," + - "{\"id\":5,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"授权个人信息\"}," + - "{\"id\":6,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"授权手机号\"}," + - "{\"id\":7,\"limit\":1,\"step\":1,\"score\":100,\"desc\":\"编辑个人信息\"}" + + "{\"id\":3,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"绑定车牌1个\"}," + + "{\"id\":5,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权个人信息\"}," + + "{\"id\":6,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"授权手机号\"}," + + "{\"id\":7,\"limit\":1,\"step\":1,\"score\":0,\"desc\":\"编辑个人信息\"}" + "]"; @Transient 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 66389363b..cba1e781f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.mapper.WxScoreHistoryMapper; import com.iformall.mapper.WxScoreRulesMapper; import com.iformall.service.WxCUserService; import com.iformall.service.WxScoreRulesService; +import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,10 +28,6 @@ import java.util.List; public class WxScoreRulesServiceImpl implements WxScoreRulesService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private String keyPrev = "setting:scorerules1:"; - - private String creditKeyPrev = "setting:creditrules1:"; - @Autowired WxScoreRulesMapper wxScoreRulesMapper; @Autowired @@ -49,7 +46,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { @Override public WxScoreRules getScoreRules(String tenantId) { // get pushLime from cache - String key = keyPrev + tenantId; + String key = Constant.SCORE_RULES_KEY_PREV + tenantId; // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { @@ -124,7 +121,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { @Override public WxScoreRules getCreditRules(String tenantId) { // get pushLime from cache - String key = creditKeyPrev + tenantId; + String key = Constant.CREDIT_RULES_KEY_PREV + tenantId; // 缓存存在 if (scoreRulesRedisTemplate.hasKey(key)) { @@ -170,7 +167,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { if (record != null && record.getType() == EnumScoreRules.SCORE.getCode()) { // 缓存存在,删除缓存 - String key = keyPrev + record.getTenantId(); + String key = Constant.SCORE_RULES_KEY_PREV + record.getTenantId(); boolean hasKey = scoreRulesRedisTemplate.hasKey(key); if (hasKey) { scoreRulesRedisTemplate.delete(key); @@ -179,7 +176,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { } if (record != null && record.getType() == EnumScoreRules.CREDIT.getCode()) { // 缓存存在,删除缓存 - String key = creditKeyPrev + record.getTenantId(); + String key = Constant.CREDIT_RULES_KEY_PREV + record.getTenantId(); boolean hasKey = scoreRulesRedisTemplate.hasKey(key); if (hasKey) { scoreRulesRedisTemplate.delete(key); diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 0d9223d64..347330690 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -19,6 +19,11 @@ public class Constant { public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; public static final String TENANT_ID = "TENANT_ID"; + // 成长值规则 key prev + public static final String SCORE_RULES_KEY_PREV = "setting:scorerules1:"; + // 积分规则 key prev + public static final String CREDIT_RULES_KEY_PREV = "setting:creditrules1:"; + public static final String fileDirectory = "./uploads/"; public static final String importMemPrev = "importmem/"; public static final String adminPage = "https://admin.malls.iformall.com";