Преглед изворни кода

[C端][修改][新用户登录后只增加成长值不再增加积分,授权手机号才增加积分]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
04aadccb96
1 измењених фајлова са 26 додато и 2 уклоњено
  1. +26
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

+ 26
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Прегледај датотеку

@@ -14,8 +14,12 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCUserVo; import com.iformall.domain.vo.WxCUserVo;
import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.domain.vo.WxLevelMerchantCVo;
import com.iformall.enums.*;
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.exception.MallinkException;
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;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
@@ -89,6 +93,8 @@ public class WxUserGrantController extends BaseController {
@Autowired @Autowired
WxCreditHistoryService wxCreditHistoryService; WxCreditHistoryService wxCreditHistoryService;


@Autowired
WxCUserBasicInfoMapper wxCUserBasicInfoMapper;
/** /**
* 微信消息服务验证 * 微信消息服务验证
* *
@@ -313,7 +319,15 @@ public class WxUserGrantController extends BaseController {
request.setAttribute(Constant.TENANT_ID, newUser.getTenantId()); request.setAttribute(Constant.TENANT_ID, newUser.getTenantId());


// 登录后处理 // 登录后处理
int score = wxCUserService.actionAfterLogin(newUser, null);
// 成长值
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());
}
resultMap.put("score", score); resultMap.put("score", score);
} }


@@ -508,6 +522,16 @@ public class WxUserGrantController extends BaseController {
user.setPhone(phoneNoInfo.getPhoneNumber()); user.setPhone(phoneNoInfo.getPhoneNumber());
user.setPurePhone(phoneNoInfo.getPurePhoneNumber()); user.setPurePhone(phoneNoInfo.getPurePhoneNumber());
user.setCountryCode(phoneNoInfo.getCountryCode()); user.setCountryCode(phoneNoInfo.getCountryCode());
if (isFirstPhone) {
//检查是否存在会员信息 如果有 赋值积分
WxCUserBasicInfo wxCUserBasicInfoQuery = new WxCUserBasicInfo();
wxCUserBasicInfoQuery.setPhone(user.getPhone());
wxCUserBasicInfoQuery.setTenantId(user.getTenantId());
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectOne(wxCUserBasicInfoQuery);
if (wxCUserBasicInfo != null) {
user.setCredit(wxCUserBasicInfo.getCredit());
}
}
wxCUserService.saveOrUpdate(user); wxCUserService.saveOrUpdate(user);


if(isFirstPhone) { if(isFirstPhone) {


Loading…
Откажи
Сачувај