From f7fe4946e87b5ece3ec23e139ee1f26dce9513f6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 26 Apr 2019 10:08:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8E=88=E6=9D=83][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=98=B5=E7=A7=B0=E6=8E=88=E6=9D=83=EF=BC=8C?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=EF=BC=8C=E7=BB=99=E6=88=90=E9=95=BF=E5=80=BC=E5=92=8C=E7=A7=AF?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserGrantController.java | 31 +++++++++++++------ .../java/com/iformall/common/ErrorCode.java | 1 + 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index acfe596fd..c421dcf1f 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -353,9 +353,15 @@ public class WxUserGrantController extends BaseController { WxCUser user = getUser(); if (user != null) { + logger.debug(user.toString()); + + boolean bFirstNickName = false; + if(StringUtils.isBlank(user.getNickName())) { + bFirstNickName = true; + } + WxMaService wxMaService = getWeappService(user.getAppId()); - logger.debug(user.toString()); String session_key = user.getSessionKey(); try { // 解密用户信息 @@ -371,10 +377,13 @@ public class WxUserGrantController extends BaseController { user.setLanguage(userInfo.getLanguage()); wxCUserService.saveOrUpdate(user); - // 成长值 - wxScoreRulesService.addScore(EnumScoreType.WECHAT_PERSION, user); - //增加积分 - addCredit(user, EnumScoreType.WECHAT_PERSION); + if(bFirstNickName) { + // 首次获取昵称 + // 成长值 + wxScoreRulesService.addScore(EnumScoreType.WECHAT_PERSION, user); + //增加积分 + addCredit(user, EnumScoreType.WECHAT_PERSION); + } resultMap.put("openId", user.getOpenId()); resultMap.put("unionId", user.getUnionId()); @@ -388,7 +397,7 @@ public class WxUserGrantController extends BaseController { return new ResultData(ErrorCode.DB_FAIL.getCode(), "解密并保存出错", resultMap); } } else { - return new ResultData(ErrorCode.USER_IS_EMPTY); + return new ResultData(ErrorCode.USER_LOGIN_FAILED); } } @@ -416,9 +425,13 @@ public class WxUserGrantController extends BaseController { WxCUser user = getUser(); - boolean bPhone = false; + if (user == null) { + return new ResultData(ErrorCode.USER_IS_EMPTY); + } + + boolean isFirstPhone = false; if(StringUtils.isBlank(user.getPhone())) { - bPhone = true; + isFirstPhone = true; } WxMaService wxMaService = getWeappService(user.getAppId()); @@ -434,7 +447,7 @@ public class WxUserGrantController extends BaseController { user.setCountryCode(phoneNoInfo.getCountryCode()); wxCUserService.saveOrUpdate(user); - if(bPhone) { + if(isFirstPhone) { // 首次授权, 增加成长值及积分 // 成长值 user.setScore(wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user)); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 0fb751d3e..4b48b62c7 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -190,6 +190,7 @@ public enum ErrorCode{ WE_RUN_DATA_DECODE_ERR(11008, "运动信息解密失败"), MP_TEMPLATE_SEND_FAILED(11009, "公众号模板消息发送失败"), UNIFORM_SEND_FAILED(11010, "小程序统一消息发送失败"), + USER_LOGIN_FAILED(11011, "微信用户未登录或登录有问题"), /**