From a757daf79dcd99d66816fda2151b0f3ce1004869 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Thu, 5 Sep 2024 14:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Login.go       | 33 ++++++++++++++++++---------------
 api/controller/OrderSingle.go |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

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
 	}