Browse Source

huiyuan

release_toaliyun_real
xhxu 4 years ago
parent
commit
ab2f2265cc
3 changed files with 20 additions and 25 deletions
  1. +18
    -7
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +1
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  3. +1
    -16
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

+ 18
- 7
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java View File

@@ -9,11 +9,9 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.enums.EnumScoreType;
import com.iformall.exception.MallinkException;
import com.iformall.service.CUserTokenService;
import com.iformall.service.WxAppinfoService;
import com.iformall.service.WxCUserBasicChildService;
import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.*;
import com.iformall.service.wechat.FmOpenService;
import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil;
@@ -61,6 +59,12 @@ public class BaseController {
@Autowired
private CUserTokenService cUserTokenService;

@Autowired
private WxScoreRulesService wxScoreRulesService;

@Autowired
private MemCouponFromDspService memCouponFromDspService;
@Autowired
@Qualifier("objectCommonRedisTemplate")
@@ -215,7 +219,7 @@ public class BaseController {
}


public Long saveToBasicInfoByCUser(String userPhone,String userName,String avatarUrl,Integer sex,Long userId,Boolean isFirstPhone) {
public Long saveToBasicInfoByCUser(String userPhone,String userName,String avatarUrl,Integer sex,Long userId) {
TenantEntity tenantEntity = getTenantInfo();
if (StringUtils.isBlank(userPhone))
return null;
@@ -243,7 +247,6 @@ public class BaseController {
basicInfo.setSex(sex);
wxCUserBasicInfoService.update(basicInfo);
removeCacheMember(basicInfo.getId());
isFirstPhone = false;
return basicInfo.getId();
} else {
if (byId != null) {
@@ -256,7 +259,6 @@ public class BaseController {
byId.setSex(sex);
wxCUserBasicInfoService.update(byId);
removeCacheMember(basicInfo.getId());
isFirstPhone = false;
return byId.getId();
} else {
basicInfo = new WxCUserBasicInfo();
@@ -268,6 +270,15 @@ public class BaseController {
basicInfo.setSex(sex);
wxCUserBasicInfoService.save(basicInfo);
removeCacheMember(basicInfo.getId());

// 首次授权, 增加成长值及积分
// 成长值
wxScoreRulesService.addScore(tenantEntity, EnumScoreType.WECHAT_PHONE, basicInfo);
// 增加积分
wxCUserBasicInfoService.addCredit(basicInfo.getId(),tenantEntity,EnumScoreType.WECHAT_PHONE);
// 外部注券
memCouponFromDspService.couponOrderFromDsp(tenantEntity, userPhone);

return basicInfo.getId();
}
}


+ 1
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java View File

@@ -75,9 +75,8 @@ public class WxMsgValidationcodeController extends BaseController {
//wxMsgValidationcode.setAppid(user.getAppId());
ResultData rd = wxMsgValidationcodeService.hasvalidationcode(wxMsgValidationcode);
if (rd.code == Result.SUCCESS) {
Boolean isFirstPhone = false;
// 更新到basicinfo
Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId(),isFirstPhone);
Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId());
if (null != basicUserId) {
if(basicUserId.intValue() == -1){
return rd;


+ 1
- 16
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -598,11 +598,6 @@ public class WxUserGrantController extends BaseController {
return new ResultData(ErrorCode.USER_IS_EMPTY);
}

Boolean isFirstPhone = false;
if(user.getUserId() == null) {
isFirstPhone = true;
}

WxMaService wxMaService = getWeappService(user.getAppId());

String session_key = user.getSessionKey();
@@ -622,7 +617,7 @@ public class WxUserGrantController extends BaseController {
phone = user.getVerifyCodePhone();
}
// 更新到basicinfo
Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId(),isFirstPhone);
Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId());
if (null != userBasicId) {
if(userBasicId.intValue() == -1){
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND);
@@ -638,16 +633,6 @@ public class WxUserGrantController extends BaseController {
removeCacheCUser();

if(isFirstPhone) {
// 首次授权, 增加成长值及积分
// 成长值
wxScoreRulesService.addScore(getTenantInfo(),EnumScoreType.WECHAT_PHONE, user);
// 增加积分
wxCUserBasicInfoService.addCredit(user.getUserId(),getTenantInfo(),EnumScoreType.WECHAT_PHONE);
// 外部注券
memCouponFromDspService.couponOrderFromDsp(tenantEntity, phoneNoInfo.getPhoneNumber());
}

resultMap.put("msg", "授权手机成功!");
resultMap.put("phone", phoneNoInfo.getPhoneNumber());
} else {


Loading…
Cancel
Save