diff --git a/api/controller/Login.go b/api/controller/Login.go index fd55698..bdbf50d 100644 --- a/api/controller/Login.go +++ b/api/controller/Login.go @@ -32,9 +32,12 @@ func (r *Login) Login(c *gin.Context) { return } - if req.Mobile == "" { - responses.FailWithMessage("登陆失败", c) - return + // 公众号登录 + if req.Source == 2 { + 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) return } - } - // 处理用户openid - if req.OpenId != "" { - userData := make(map[string]interface{}) - if req.OpenId != user.OpenId { - userData["open_id"] = req.OpenId - } + // 处理用户openid + if req.OpenId != "" { + userData := make(map[string]interface{}) + if req.OpenId != user.OpenId { + userData["open_id"] = req.OpenId + } - err := userDao.EditUserById(tx, user.UserId, userData) - if err != nil { - tx.Rollback() - responses.FailWithMessage(err.Error(), c) - return + err := userDao.EditUserById(tx, user.UserId, userData) + if err != nil { + tx.Rollback() + responses.FailWithMessage(err.Error(), c) + return + } } } diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go index 7bf08b4..615b4be 100644 --- a/api/controller/OrderSingle.go +++ b/api/controller/OrderSingle.go @@ -416,7 +416,7 @@ func (b *OrderSingle) PutOrderSingleAnswer(c *gin.Context) { // 检测订单状态 if orderSingle.OrderStatus != 2 { - responses.FailWithMessage("订单未完成", c) + responses.FailWithMessage("订单异常", c) return }