Răsfoiți Sursa

fix:修复更新登录状态失败

zqbao 9 luni în urmă
părinte
comite
ea098833c4
7 a modificat fișierele cu 50 adăugiri și 28 ștergeri
  1. 25 0
      controllers/banner.go
  2. 1 1
      controllers/user.go
  3. 1 1
      controllers/wechat.go
  4. 7 0
      models/banner.go
  5. 2 2
      models/user.go
  6. 9 0
      routers/commentsRouter.go
  7. 5 24
      services/user.go

+ 25 - 0
controllers/banner.go

@@ -43,3 +43,28 @@ func (this *BannerController) List() {
 	br.Success = true
 	br.Ret = 200
 }
+
+// @Title Detail
+// @Description banner详情
+// @Param   BannerId   query   int  true       "bannerId"
+// @Success 200 {object} models.BaseResponse
+// @router /detail [get]
+func (this *BannerController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	bannerId, _ := this.GetInt("BannerId")
+
+	banners, err := models.GetBannerById(bannerId)
+	if err != nil {
+		br.Msg = "获取banner详情失败"
+		br.ErrMsg = "获取banner详情失败,系统异常,Err:" + err.Error()
+		return
+	}
+	br.Data = banners
+	br.Msg = "获取banner列表成功"
+	br.Success = true
+	br.Ret = 200
+}

+ 1 - 1
controllers/user.go

@@ -102,7 +102,7 @@ func (this *UserAuthController) Login() {
 			return
 		}
 	}
-	_, errMsg, err := services.BindWxUser(user.UnionId, user.OpenId, req.Phone, req.Email, req.AreaCode)
+	_, errMsg, err := services.BindUser(user.UnionId, user.OpenId, req.Phone, req.Email, req.AreaCode)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "登录失败,系统处理中,请稍后重试"
 		if errMsg != `` {

+ 1 - 1
controllers/wechat.go

@@ -235,7 +235,7 @@ func (this *WechatController) Login() {
 	token = utils.MD5(strconv.Itoa(user.UserId)) + utils.MD5(timeUnixStr)
 	user.AccessToken = token
 	user.LastUpdateTime = time.Now()
-	_, err = user.Update([]string{"access_token", "last_update_time"})
+	err = user.Update([]string{"access_token", "last_update_time"})
 	if err != nil {
 		br.Msg = "微信登录失败"
 		br.ErrMsg = "微信登录失败,更新用户信息失败:" + err.Error()

+ 7 - 0
models/banner.go

@@ -21,3 +21,10 @@ func GetBannerList(startSize, pageSize int) (items []*Banner, err error) {
 	_, err = o.Raw(sql, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+func GetBannerById(bannerId int) (items *Banner, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM banner WHERE banner_id = ?`
+	err = o.Raw(sql, bannerId).QueryRow(&items)
+	return
+}

+ 2 - 2
models/user.go

@@ -35,9 +35,9 @@ func (u *User) Insert() (insertId int64, err error) {
 	return
 }
 
-func (u *User) Update(cols []string) (updateId int64, err error) {
+func (u *User) Update(cols []string) (err error) {
 	o := orm.NewOrm()
-	updateId, err = o.Update(u, cols...)
+	_, err = o.Update(u, cols...)
 	return
 }
 

+ 9 - 0
routers/commentsRouter.go

@@ -7,6 +7,15 @@ import (
 
 func init() {
 
+    beego.GlobalControllerRouter["eta/eta_mini_api/controllers:BannerController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:BannerController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_api/controllers:BannerController"] = append(beego.GlobalControllerRouter["eta/eta_mini_api/controllers:BannerController"],
         beego.ControllerComments{
             Method: "List",

+ 5 - 24
services/user.go

@@ -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 {