| @@ -549,10 +549,10 @@ public class WxUserGrantController extends BaseController { | |||||
| if (user != null) { | if (user != null) { | ||||
| logger.debug(user.toString()); | 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()); | WxMaService wxMaService = getWeappService(user.getAppId()); | ||||
| @@ -592,13 +592,13 @@ public class WxUserGrantController extends BaseController { | |||||
| removeCacheCUser(); | 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("openId", user.getOpenId()); | ||||
| resultMap.put("unionId", user.getUnionId()); | resultMap.put("unionId", user.getUnionId()); | ||||
| resultMap.put("msg", "获取用户信息成功!"); | resultMap.put("msg", "获取用户信息成功!"); | ||||
| @@ -350,9 +350,9 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| if (record.getCreditType() == EnumScoreType.BIND_CAR.getCode()) { | if (record.getCreditType() == EnumScoreType.BIND_CAR.getCode()) { | ||||
| return bindCarAddCredit(record); | 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()) { | if (record.getCreditType() == EnumScoreType.WECHAT_PHONE.getCode()) { | ||||
| return phoneAddCredit(record); | return phoneAddCredit(record); | ||||
| } | } | ||||
| @@ -407,12 +407,12 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); | 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) { | private int phoneAddCredit(WxCreditHistory record) { | ||||
| // 1. 获取score rules | // 1. 获取score rules | ||||
| @@ -419,21 +419,21 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| return addScoreNumber; | 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) { | private int phoneAddScore(TenantEntity tenantEntity,WxCUserBasicInfo user) { | ||||
| int addScoreNumber = 0; | int addScoreNumber = 0; | ||||
| @@ -600,9 +600,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| case BIND_CAR:{ | case BIND_CAR:{ | ||||
| return bindCarAddScore(tenantEntity,wxCUserBasicInfo); | return bindCarAddScore(tenantEntity,wxCUserBasicInfo); | ||||
| } | } | ||||
| case WECHAT_PERSION:{ | |||||
| return personAddScore(tenantEntity,wxCUserBasicInfo); | |||||
| } | |||||
| // case WECHAT_PERSION:{ | |||||
| // return personAddScore(tenantEntity,wxCUserBasicInfo); | |||||
| // } | |||||
| case WECHAT_PHONE:{ | case WECHAT_PHONE:{ | ||||
| return phoneAddScore(tenantEntity,wxCUserBasicInfo); | return phoneAddScore(tenantEntity,wxCUserBasicInfo); | ||||
| } | } | ||||