From b5f41430918c30f1923c83c6bd8d6b1e29b433ff Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 16 Dec 2020 17:27:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserGrantController.java | 22 ++++++------ .../impl/WxCreditHistoryServiceImpl.java | 18 +++++----- .../service/impl/WxScoreRulesServiceImpl.java | 36 +++++++++---------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 1d326c150..7fcd4cfef 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -549,10 +549,10 @@ public class WxUserGrantController extends BaseController { if (user != null) { logger.debug(user.toString()); - boolean bFirstNickName = false; - if(StringUtils.isNoneEmpty(user.getNickName())) { - bFirstNickName = true; - } +// boolean bFirstNickName = false; +// if(StringUtils.isNoneEmpty(user.getNickName())) { +// bFirstNickName = true; +// } WxMaService wxMaService = getWeappService(user.getAppId()); @@ -592,13 +592,13 @@ public class WxUserGrantController extends BaseController { removeCacheCUser(); - if(bFirstNickName) { - // 首次获取昵称 - // 成长值 - wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.WECHAT_PERSION, user); - //增加积分 - wxCUserService.addCredit(user, EnumScoreType.WECHAT_PERSION); - } +// if(bFirstNickName) { +// // 首次获取昵称 +// // 成长值 +// wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.WECHAT_PERSION, user); +// //增加积分 +// wxCUserService.addCredit(user, EnumScoreType.WECHAT_PERSION); +// } resultMap.put("openId", user.getOpenId()); resultMap.put("unionId", user.getUnionId()); resultMap.put("msg", "获取用户信息成功!"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index cd7311048..c2206c0cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -350,9 +350,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType() == EnumScoreType.BIND_CAR.getCode()) { return bindCarAddCredit(record); } - if (record.getCreditType() == EnumScoreType.WECHAT_PERSION.getCode()) { - return personAddCredit(record); - } +// if (record.getCreditType() == EnumScoreType.WECHAT_PERSION.getCode()) { +// return personAddCredit(record); +// } if (record.getCreditType() == EnumScoreType.WECHAT_PHONE.getCode()) { return phoneAddCredit(record); } @@ -407,12 +407,12 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); } - private int personAddCredit(WxCreditHistory record) { - // 1. 获取score rules - WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); - // 2. 增长的积分 - return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE); - } +// private int personAddCredit(WxCreditHistory record) { +// // 1. 获取score rules +// WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(record.getTenantId()); +// // 2. 增长的积分 +// return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE); +// } private int phoneAddCredit(WxCreditHistory record) { // 1. 获取score rules 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 ebc7854d2..d811e142f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -419,21 +419,21 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { return addScoreNumber; } - private int personAddScore(TenantEntity tenantEntity,WxCUserBasicInfo user) { - int addScoreNumber = 0; - // 1. 获取score rules - WxScoreRules scoreRules = getScoreRules(tenantEntity); - - // 2. 获取成长值 - addScoreNumber = scoreRules.getRule(EnumScoreType.WECHAT_PERSION,WxScoreRules.SCORE); - - // 3. 增长的成长值 - updateScore(user.getId(),tenantEntity, addScoreNumber); - - // 4. 记录历史 - recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.WECHAT_PERSION); - return addScoreNumber; - } +// private int personAddScore(TenantEntity tenantEntity,WxCUserBasicInfo user) { +// int addScoreNumber = 0; +// // 1. 获取score rules +// WxScoreRules scoreRules = getScoreRules(tenantEntity); +// +// // 2. 获取成长值 +// addScoreNumber = scoreRules.getRule(EnumScoreType.WECHAT_PERSION,WxScoreRules.SCORE); +// +// // 3. 增长的成长值 +// updateScore(user.getId(),tenantEntity, addScoreNumber); +// +// // 4. 记录历史 +// recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.WECHAT_PERSION); +// return addScoreNumber; +// } private int phoneAddScore(TenantEntity tenantEntity,WxCUserBasicInfo user) { int addScoreNumber = 0; @@ -600,9 +600,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { case BIND_CAR:{ return bindCarAddScore(tenantEntity,wxCUserBasicInfo); } - case WECHAT_PERSION:{ - return personAddScore(tenantEntity,wxCUserBasicInfo); - } +// case WECHAT_PERSION:{ +// return personAddScore(tenantEntity,wxCUserBasicInfo); +// } case WECHAT_PHONE:{ return phoneAddScore(tenantEntity,wxCUserBasicInfo); }