From d2e296c90a65b86dc627804e1ed51582746440cf Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Fri, 30 May 2025 09:51:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=8E=E6=85=A7=E5=B8=90=E6=88=B7=E6=94=B6=E8=B4=B9=E6=94=B9?=
 =?UTF-8?q?=E5=9B=9E=E6=B2=B3=E9=A9=AC=E4=BB=98=E5=B8=90=E6=88=B7=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/mall.go | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/controller/mall.go b/controller/mall.go
index d832ce8..0924de7 100644
--- a/controller/mall.go
+++ b/controller/mall.go
@@ -480,8 +480,8 @@ func MallOrderCreate(c *gin.Context) {
 		}
 
 		RespOK(c, ret)
-	} else { // 其他则默认明慧账户收费
-		webPay, err := wxpay.WebPay(order.SerialNo, order.Rm, user.WxOpenID, "N", wxpay.WxPayBuyGoods, configInfo.NotifyUrl, false)
+	} else { // 其他则默认明慧河马付账户收费
+		webPay, err := wxpay.HmJsPayUnifiedOrderForBuyGoods(order.SerialNo, order.Rm, user.WxOpenID, configInfo.NotifyUrl)
 		if err != nil {
 			logger.Error(errors.New("WebPay err"))
 			RespJson(c, status.InternalServerError, nil)
@@ -495,21 +495,6 @@ func MallOrderCreate(c *gin.Context) {
 		}
 
 		RespOK(c, ret)
-
-		//webPay, err := wxpay.HmJsPayUnifiedOrderForBuyGoods(order.SerialNo, order.Rm, user.WxOpenID, configInfo.NotifyUrl)
-		//if err != nil {
-		//	logger.Error(errors.New("WebPay err"))
-		//	RespJson(c, status.InternalServerError, nil)
-		//	return
-		//}
-		//
-		//ret := map[string]interface{}{
-		//	"web_pay":  webPay,
-		//	"order_id": order.ID,
-		//	"order":    order,
-		//}
-		//
-		//RespOK(c, ret)
 	}
 
 	return