|
@@ -6,28 +6,10 @@ import (
|
|
|
"eta/eta_mini_api/services/go_redis"
|
|
|
"eta/eta_mini_api/utils"
|
|
|
"time"
|
|
|
-
|
|
|
- "github.com/silenceper/wechat/v2/miniprogram/auth"
|
|
|
)
|
|
|
|
|
|
-type UserInfo struct {
|
|
|
-}
|
|
|
-
|
|
|
-func WxLogin(wxSession auth.ResCode2Session) (token string, userId int, isBind bool, err error) {
|
|
|
- // openId := wxSession.OpenID
|
|
|
- // unionId := wxSession.UnionID
|
|
|
- // sessionKey := wxSession.SessionKey
|
|
|
-
|
|
|
- return
|
|
|
-}
|
|
|
-
|
|
|
-// GetWxUserItemByOpenId 通过openid获取用户信息
|
|
|
-func GetWxUserItemByOpenId(openid string) (userInfo UserInfo, err error) {
|
|
|
- return
|
|
|
-}
|
|
|
-
|
|
|
-// BindWxUser 用户绑定
|
|
|
-func BindWxUser(unionId, openId, phone, email, areaCode string) (userItem *models.UserItem, errMsg string, err error) {
|
|
|
+// BindUser 用户绑定
|
|
|
+func BindUser(unionId, openId, phone, email, areaCode string) (userItem *models.UserItem, errMsg string, err error) {
|
|
|
if phone == "" && email == "" {
|
|
|
err = errors.New("手机号或邮箱必填一个")
|
|
|
return
|
|
@@ -44,6 +26,7 @@ func BindWxUser(unionId, openId, phone, email, areaCode string) (userItem *model
|
|
|
var userId int64
|
|
|
curTime := time.Now()
|
|
|
if userItem != nil {
|
|
|
+ userId = int64(userItem.UserId)
|
|
|
if userItem.Phone != "" && userItem.Phone != phone {
|
|
|
errMsg = "该手机号已绑定其他微信号"
|
|
|
return
|
|
@@ -60,8 +43,7 @@ func BindWxUser(unionId, openId, phone, email, areaCode string) (userItem *model
|
|
|
RegisterTime: curTime,
|
|
|
ModifyTime: curTime,
|
|
|
}
|
|
|
- tmpUserId, updateUserErr := user.Update([]string{"phone", "area_code", "register_time", "modify_time"})
|
|
|
- userId = tmpUserId
|
|
|
+ updateUserErr := user.Update([]string{"phone", "area_code", "register_time", "modify_time"})
|
|
|
err = updateUserErr
|
|
|
}
|
|
|
if userItem.Email == "" && email != "" {
|
|
@@ -71,8 +53,7 @@ func BindWxUser(unionId, openId, phone, email, areaCode string) (userItem *model
|
|
|
RegisterTime: curTime,
|
|
|
ModifyTime: curTime,
|
|
|
}
|
|
|
- tmpUserId, updateUserErr := user.Update([]string{"email", "modify_time", "register_time"})
|
|
|
- userId = tmpUserId
|
|
|
+ updateUserErr := user.Update([]string{"email", "modify_time", "register_time"})
|
|
|
err = updateUserErr
|
|
|
}
|
|
|
} else {
|