| @@ -18,7 +18,6 @@ import com.iformall.enums.EnumAssignTagsTrigger; | |||||
| import com.iformall.enums.EnumLevelConfigDiscountStatus; | import com.iformall.enums.EnumLevelConfigDiscountStatus; | ||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import com.iformall.enums.EnumUserType; | import com.iformall.enums.EnumUserType; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.WxCUserBasicInfoMapper; | import com.iformall.mapper.WxCUserBasicInfoMapper; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.service.wechat.FmOpenService; | import com.iformall.service.wechat.FmOpenService; | ||||
| @@ -319,15 +318,7 @@ public class WxUserGrantController extends BaseController { | |||||
| request.setAttribute(Constant.TENANT_ID, newUser.getTenantId()); | 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); | resultMap.put("score", score); | ||||
| } | } | ||||
| @@ -530,7 +521,9 @@ public class WxUserGrantController extends BaseController { | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery); | WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery); | ||||
| if (wxCUserBasicInfo != null) { | if (wxCUserBasicInfo != null) { | ||||
| int credit = user.getCredit() == null ? 0 : user.getCredit(); | int credit = user.getCredit() == null ? 0 : user.getCredit(); | ||||
| int score = user.getScore() == null ? 0 : user.getScore(); | |||||
| user.setCredit(wxCUserBasicInfo.getCredit() + credit); | user.setCredit(wxCUserBasicInfo.getCredit() + credit); | ||||
| user.setScore(wxCUserBasicInfo.getPoins() + score); | |||||
| } | } | ||||
| } | } | ||||
| wxCUserService.saveOrUpdate(user); | wxCUserService.saveOrUpdate(user); | ||||