From 7c87b2203df4517d9e3a05eeb0c66ce229c460a6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sun, 30 Jun 2019 02:01:37 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E4=BF=AE=E6=94=B9][=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=97=B6=E6=8A=8A=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E4=B8=AD=E7=9A=84=E7=A7=AF=E5=88=86=E4=B8=8E=E6=88=90?= =?UTF-8?q?=E9=95=BF=E5=80=BC=E5=8A=A0=E5=88=B0=E5=BE=AE=E4=BF=A1=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=8E=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxUserGrantController.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 7bd25d1b5..c930b2d4e 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -18,7 +18,6 @@ import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumLevelConfigDiscountStatus; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; -import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.service.*; import com.iformall.service.wechat.FmOpenService; @@ -319,15 +318,7 @@ public class WxUserGrantController extends BaseController { request.setAttribute(Constant.TENANT_ID, newUser.getTenantId()); // 登录后处理 - // 成长值 - int score = 0; - try { - score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, newUser); - } catch (MallinkException e) { - logger.error("c_user 成长值 " + e.getMessage()); - } catch (Exception e) { - logger.error("c_user 成长值 " + e.getMessage()); - } + int score = wxCUserService.actionAfterLogin(newUser, null); resultMap.put("score", score); } @@ -530,7 +521,9 @@ public class WxUserGrantController extends BaseController { WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery); if (wxCUserBasicInfo != null) { int credit = user.getCredit() == null ? 0 : user.getCredit(); + int score = user.getScore() == null ? 0 : user.getScore(); user.setCredit(wxCUserBasicInfo.getCredit() + credit); + user.setScore(wxCUserBasicInfo.getPoins() + score); } } wxCUserService.saveOrUpdate(user);