From 301b11fa4e2e30ee463bd389cbfe10ff0739ea90 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 20 Sep 2024 14:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/Pay.go      |  7 ++++++-
 api/service/OrderSingle.go | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/api/controller/Pay.go b/api/controller/Pay.go
index 3824f29..f4407c1 100644
--- a/api/controller/Pay.go
+++ b/api/controller/Pay.go
@@ -152,9 +152,14 @@ func (r *Pay) GetPayOrder(c *gin.Context) {
 		return
 	}
 
+	appId := config.C.Wechat.AppId
+	if config.C.Env == "dev" {
+		appId = config.C.Wechat.TestPayAppId
+	}
+
 	// 处理返回数据
 	g := app.PayOrderDataResponse{
-		AppId:       config.C.Wechat.TestPayAppId,
+		AppId:       appId,
 		Total:       paymentAmountTotal,
 		Description: "肝病算一算",
 		OpenId:      user.OpenId,
diff --git a/api/service/OrderSingle.go b/api/service/OrderSingle.go
index 8965add..a76cbd6 100644
--- a/api/service/OrderSingle.go
+++ b/api/service/OrderSingle.go
@@ -364,8 +364,13 @@ func (r *OrderSingleService) GetJsapiPrepay(m *model.OrderSingle) (prepay *jsapi
 		return nil, errors.New("发起支付失败")
 	}
 
+	appId := config.C.Wechat.AppId
+	if config.C.Env == "dev" {
+		appId = config.C.Wechat.TestPayAppId
+	}
+
 	jsapiRequest := weChat.JsapiRequest{
-		AppId:       config.C.Wechat.TestPayAppId,
+		AppId:       appId,
 		MchId:       config.C.Wechat.Pay1281030301.MchId,
 		Description: "肝病算一算",
 		OutTradeNo:  m.OrderNo,
@@ -398,8 +403,13 @@ func (r *OrderSingleService) GetAppPrepay(m *model.OrderSingle) (prepay *app.Pre
 		return nil, errors.New("发起支付失败")
 	}
 
+	appId := config.C.Wechat.AppId
+	if config.C.Env == "dev" {
+		appId = config.C.Wechat.TestPayAppId
+	}
+
 	appRequest := weChat.AppRequest{
-		AppId:       config.C.Wechat.TestPayAppId,
+		AppId:       appId,
 		MchId:       config.C.Wechat.Pay1281030301.MchId,
 		Description: "肝病算一算",
 		OutTradeNo:  m.OrderNo,