|
@@ -105,21 +105,15 @@ func PcBindMobile(unionId, mobile string, userId, loginType int) (wxUserId int,
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
return
|
|
|
}
|
|
|
- dsql := ` DELETE FROM wx_user WHERE user_id = ? `
|
|
|
- _, err = o.Raw(dsql, userId).Exec()
|
|
|
- if err != nil {
|
|
|
- return user.UserId, err
|
|
|
- }
|
|
|
- if user.Mobile == "" && loginType == 1 {
|
|
|
- msql := ` UPDATE wx_user SET mobile = ?,bind_account = ? WHERE user_id = ?`
|
|
|
- _, err = o.Raw(msql, mobile, mobile, user.UserId).Exec()
|
|
|
- wxUserId = user.UserId
|
|
|
- }
|
|
|
- if user.Email == "" && loginType == 2 {
|
|
|
- msql := ` UPDATE wx_user SET email = ?,bind_account = ? WHERE user_id = ?`
|
|
|
- _, err = o.Raw(msql, mobile, mobile, user.UserId).Exec()
|
|
|
- wxUserId = user.UserId
|
|
|
+ if user.UserId != userId {
|
|
|
+ dsql := ` DELETE FROM wx_user WHERE user_id = ? `
|
|
|
+ _, err = o.Raw(dsql, userId).Exec()
|
|
|
+ if err != nil {
|
|
|
+ return user.UserId, err
|
|
|
+ }
|
|
|
}
|
|
|
+ msql := ` UPDATE wx_user SET union_id=?,province=?,city=?,country=?,headimgurl=?,unionid=?,sex=? WHERE user_id = ? `
|
|
|
+ _, err = o.Raw(msql, unionId, userInfo.Province, userInfo.City, userInfo.Country, userInfo.Headimgurl, unionId, userInfo.Sex, user.UserId).Exec()
|
|
|
utils.FileLog.Info("用户存在,bind:%s,%d,%s", unionId, wxUserId)
|
|
|
wxUserId = userId
|
|
|
}
|