gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正了公众号登录问题

Browse Source
This commit is contained in:
wucongxing8150 2024-09-05 14:40:45 +08:00
parent 363c02fec0
commit a757daf79d
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
api/controller/Login.go
View File

@ -32,9 +32,12 @@ func (r *Login) Login(c *gin.Context) {
return return
} }
if req.Mobile == "" { // 公众号登录
responses.FailWithMessage("登陆失败", c) if req.Source == 2 {
return if req.Mobile == "" || req.OpenId == "" {
responses.FailWithMessage("登陆失败", c)
return
}
} }
// 检测参数 // 检测参数
@ -152,20 +155,20 @@ func (r *Login) Login(c *gin.Context) {
responses.FailWithMessage(err.Error(), c) responses.FailWithMessage(err.Error(), c)
return return
} }
}
// 处理用户openid // 处理用户openid
if req.OpenId != "" { if req.OpenId != "" {
userData := make(map[string]interface{}) userData := make(map[string]interface{})
if req.OpenId != user.OpenId { if req.OpenId != user.OpenId {
userData["open_id"] = req.OpenId userData["open_id"] = req.OpenId
} }
err := userDao.EditUserById(tx, user.UserId, userData) err := userDao.EditUserById(tx, user.UserId, userData)
if err != nil { if err != nil {
tx.Rollback() tx.Rollback()
responses.FailWithMessage(err.Error(), c) responses.FailWithMessage(err.Error(), c)
return return
}
} }
} }

2
api/controller/OrderSingle.go
View File

@ -416,7 +416,7 @@ func (b *OrderSingle) PutOrderSingleAnswer(c *gin.Context) {
// 检测订单状态 // 检测订单状态
if orderSingle.OrderStatus != 2 { if orderSingle.OrderStatus != 2 {
responses.FailWithMessage("订单未完成", c) responses.FailWithMessage("订单异常", c)
return return
} }