From 9d17c26ef5460bfa914731cd7266383e08464e6d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Wed, 31 Jul 2024 18:30:05 +0800
Subject: [PATCH] 2

---
 api/controller/OrderSingle.go   |  2 +-
 api/service/OrderSingle.go      |  4 ++--
 extend/weChat/prepay.go         | 16 ++++++++--------
 extend/weChat/userInfo.go       |  2 +-
 extend/weChat/webAccessToken.go |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api/controller/OrderSingle.go b/api/controller/OrderSingle.go
index ff0e40c..a476484 100644
--- a/api/controller/OrderSingle.go
+++ b/api/controller/OrderSingle.go
@@ -254,7 +254,7 @@ func (b *OrderSingle) GetOrderSinglePay(c *gin.Context) {
 		orderSingleService := service.OrderSingleService{}
 		prepay, err := orderSingleService.GetJsapiPrepay(orderSingle)
 		if err != nil {
-			//responses.FailWithMessage("发起支付失败", c)
+			//responses.FailWithMessage("发起支付失败1", c)
 			responses.FailWithMessage(err.Error(), c)
 			return
 		}
diff --git a/api/service/OrderSingle.go b/api/service/OrderSingle.go
index 9974265..5d5c640 100644
--- a/api/service/OrderSingle.go
+++ b/api/service/OrderSingle.go
@@ -312,7 +312,7 @@ func (r *OrderSingleService) GetJsapiPrepay(m *model.OrderSingle) (prepay *jsapi
 		return nil, errors.New("用户错误")
 	}
 
-	if user.OpenId != "" {
+	if user.OpenId == "" {
 		return nil, errors.New("发起支付失败")
 	}
 
@@ -346,7 +346,7 @@ func (r *OrderSingleService) GetAppPrepay(m *model.OrderSingle) (prepay *app.Pre
 		return nil, errors.New("用户错误")
 	}
 
-	if user.OpenId != "" {
+	if user.OpenId == "" {
 		return nil, errors.New("发起支付失败")
 	}
 
diff --git a/extend/weChat/prepay.go b/extend/weChat/prepay.go
index 1beda6e..7df6f33 100644
--- a/extend/weChat/prepay.go
+++ b/extend/weChat/prepay.go
@@ -77,10 +77,6 @@ func (r JsapiRequest) GetJsapiPrepay() (prepay *jsapi.PrepayWithRequestPaymentRe
 		},
 	)
 
-	if err != nil {
-		return nil, err
-	}
-
 	if result.Response.StatusCode != 200 {
 		return nil, errors.New("发起支付失败")
 	}
@@ -89,6 +85,10 @@ func (r JsapiRequest) GetJsapiPrepay() (prepay *jsapi.PrepayWithRequestPaymentRe
 		return nil, errors.New("发起支付失败")
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	return resp, nil
 }
 
@@ -116,10 +116,6 @@ func (r AppRequest) GetAppPrepay() (prepay *app.PrepayWithRequestPaymentResponse
 		},
 	)
 
-	if err != nil {
-		return nil, err
-	}
-
 	if result.Response.StatusCode != 200 {
 		return nil, errors.New("发起支付失败")
 	}
@@ -128,5 +124,9 @@ func (r AppRequest) GetAppPrepay() (prepay *app.PrepayWithRequestPaymentResponse
 		return nil, errors.New("发起支付失败")
 	}
 
+	if err != nil {
+		return nil, err
+	}
+
 	return resp, nil
 }
diff --git a/extend/weChat/userInfo.go b/extend/weChat/userInfo.go
index b61804a..92b1131 100644
--- a/extend/weChat/userInfo.go
+++ b/extend/weChat/userInfo.go
@@ -72,5 +72,5 @@ func GetUserInfo(accessToken, openId string) (r *GetUserInfoResponse, err error)
 		}
 	}
 
-	return &response, err
+	return &response, nil
 }
diff --git a/extend/weChat/webAccessToken.go b/extend/weChat/webAccessToken.go
index f41ee42..b1cd7ba 100644
--- a/extend/weChat/webAccessToken.go
+++ b/extend/weChat/webAccessToken.go
@@ -64,5 +64,5 @@ func GetWebAccessToken(code string) (r *GetWebAccessTokenResponse, err error) {
 		}
 	}
 
-	return &response, err
+	return &response, nil
 }