|
|
|
@@ -15,6 +15,7 @@ import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCUserVo; |
|
|
|
import com.iformall.domain.vo.WxLevelMerchantCVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.service.wechat.FmOpenService; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
@@ -232,10 +233,18 @@ public class WxUserGrantController extends BaseController { |
|
|
|
// 成长值 |
|
|
|
try { |
|
|
|
score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user1); |
|
|
|
//-----增加积分start----- |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("c_user 成长值 " + e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("c_user 成长值 " + e.getMessage()); |
|
|
|
} |
|
|
|
// 积分 |
|
|
|
try { |
|
|
|
credit = addCredit(user1,EnumScoreType.LOGIN).getCreditNum(); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("c_user 积分 " + e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("c_user score " + e.getMessage()); |
|
|
|
logger.error("c_user 积分 " + e.getMessage()); |
|
|
|
} |
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN,user1); |
|
|
|
} else { |
|
|
|
@@ -264,14 +273,21 @@ public class WxUserGrantController extends BaseController { |
|
|
|
request.setAttribute(Constant.LOGIN_USER_KEY, user.getId()); |
|
|
|
request.setAttribute(Constant.TENANT_ID, user.getTenantId()); |
|
|
|
// 成长值 |
|
|
|
|
|
|
|
try { |
|
|
|
score = wxScoreRulesService.addScore(EnumScoreType.LOGIN, user); |
|
|
|
//-----增加积分start----- |
|
|
|
credit = addCredit(user,EnumScoreType.LOGIN).getCreditNum(); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("c_user 成长值 " + e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("c_user 成长值 " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
// 积分 |
|
|
|
try { |
|
|
|
credit = addCredit(user,EnumScoreType.LOGIN).getCreditNum(); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("c_user 积分 " + e.getMessage()); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
logger.error("c_user 积分 " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN,user); |
|
|
|
|