wechat payment is ready for PC

api/service/payment/alipay_service.go

@@ -41,8 +41,7 @@ func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) {
 		return nil, fmt.Errorf("error with initialize alipay service: %v", err)
 	}
 
-	client.DebugSwitch = gopay.DebugOn
-
+	//client.DebugSwitch = gopay.DebugOn // 开启调试模式
 	client.SetLocation(alipay.LocationShanghai). // 设置时区，不设置或出错均为默认服务器时间
 		SetCharset(alipay.UTF8). // 设置字符编码，不设置默认 utf-8
 		SetSignType(alipay.RSA2). // 设置签名类型，不设置默认 RSA2
@@ -56,12 +55,12 @@ func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) {
 	return &AlipayService{config: &config, client: client}, nil
 }
 
-func (s *AlipayService) PayUrlMobile(outTradeNo string, Amount string, subject string) (string, error) {
+func (s *AlipayService) PayUrlMobile(outTradeNo string, amount string, subject string) (string, error) {
 	bm := make(gopay.BodyMap)
 	bm.Set("subject", subject)
 	bm.Set("out_trade_no", outTradeNo)
 	bm.Set("quit_url", s.config.ReturnURL)
-	bm.Set("total_amount", Amount)
+	bm.Set("total_amount", amount)
 	bm.Set("product_code", "QUICK_WAP_WAY")
 	return s.client.TradeWapPay(context.Background(), bm)
 }
@@ -80,7 +79,7 @@ func (s *AlipayService) TradeVerify(request *http.Request) NotifyVo {
 	notifyReq, err := alipay.ParseNotifyToBodyMap(request) // c.Request 是 gin 框架的写法
 	if err != nil {
 		return NotifyVo{
-			Status:  0,
+			Status:  Failure,
 			Message: "error with parse notify request: " + err.Error(),
 		}
 	}
@@ -88,7 +87,7 @@ func (s *AlipayService) TradeVerify(request *http.Request) NotifyVo {
 	_, err = alipay.VerifySignWithCert(s.config.AlipayPublicKey, notifyReq)
 	if err != nil {
 		return NotifyVo{
-			Status:  0,
+			Status:  Failure,
 			Message: "error with verify sign: " + err.Error(),
 		}
 	}
@@ -104,23 +103,23 @@ func (s *AlipayService) TradeQuery(outTradeNo string) NotifyVo {
 	rsp, err := s.client.TradeQuery(context.Background(), bm)
 	if err != nil {
 		return NotifyVo{
-			Status:  0,
+			Status:  Failure,
 			Message: "异步查询验证订单信息发生错误" + outTradeNo + err.Error(),
 		}
 	}
 
 	if rsp.Response.TradeStatus == "TRADE_SUCCESS" {
 		return NotifyVo{
-			Status:     1,
+			Status:     Success,
 			OutTradeNo: rsp.Response.OutTradeNo,
-			TradeNo:    rsp.Response.TradeNo,
+			TradeId:    rsp.Response.TradeNo,
 			Amount:     rsp.Response.TotalAmount,
 			Subject:    rsp.Response.Subject,
 			Message:    "OK",
 		}
 	} else {
 		return NotifyVo{
-			Status:  0,
+			Status:  Failure,
 			Message: "异步查询验证订单信息发生错误" + outTradeNo,
 		}
 	}
@@ -133,16 +132,3 @@ func readKey(filename string) (string, error) {
 	}
 	return string(data), nil
 }
-
-type NotifyVo struct {
-	Status     int
-	OutTradeNo string
-	TradeNo    string
-	Amount     string
-	Message    string
-	Subject    string
-}
-
-func (v NotifyVo) Success() bool {
-	return v.Status == 1
-}

api/service/payment/payjs_service.go

@@ -21,12 +21,12 @@ import (
 	"strings"
 )
 
-type PayJS struct {
+type JPayService struct {
 	config *types.JPayConfig
 }
 
-func NewPayJS(appConfig *types.AppConfig) *PayJS {
-	return &PayJS{
+func NewJPayService(appConfig *types.AppConfig) *JPayService {
+	return &JPayService{
 		config: &appConfig.JPayConfig,
 	}
 }
@@ -53,7 +53,7 @@ func (r JPayReps) IsOK() bool {
 	return r.ReturnMsg == "SUCCESS"
 }
 
-func (js *PayJS) Pay(param JPayReq) JPayReps {
+func (js *JPayService) Pay(param JPayReq) JPayReps {
 	param.NotifyURL = js.config.NotifyURL
 	var p = url.Values{}
 	encode := utils.JsonEncode(param)
@@ -86,13 +86,13 @@ func (js *PayJS) Pay(param JPayReq) JPayReps {
 	return data
 }
 
-func (js *PayJS) PayH5(p url.Values) string {
+func (js *JPayService) PayH5(p url.Values) string {
 	p.Add("mchid", js.config.AppId)
 	p.Add("sign", js.sign(p))
 	return fmt.Sprintf("%s/api/cashier?%s", js.config.ApiURL, p.Encode())
 }
 
-func (js *PayJS) sign(params url.Values) string {
+func (js *JPayService) sign(params url.Values) string {
 	params.Del(`sign`)
 	var keys = make([]string, 0, 0)
 	for key := range params {
@@ -117,20 +117,18 @@ func (js *PayJS) sign(params url.Values) string {
 	return strings.ToUpper(md5res)
 }
 
-// Check 查询订单支付状态
+// TradeVerify 查询订单支付状态
 // @param tradeNo 支付平台交易 ID
-func (js *PayJS) Check(tradeNo string) error {
+func (js *JPayService) TradeVerify(tradeNo string) error {
 	apiURL := fmt.Sprintf("%s/api/check", js.config.ApiURL)
 	params := url.Values{}
 	params.Add("payjs_order_id", tradeNo)
 	params.Add("sign", js.sign(params))
 	data := strings.NewReader(params.Encode())
 	resp, err := http.Post(apiURL, "application/x-www-form-urlencoded", data)
-	defer resp.Body.Close()
 	if err != nil {
 		return fmt.Errorf("error with http reqeust: %v", err)
 	}
-
 	defer resp.Body.Close()
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {

api/service/payment/types.go

@@ -0,0 +1,19 @@
+package payment
+
+type NotifyVo struct {
+	Status     int
+	OutTradeNo string // 商户订单号
+	TradeId    string // 交易ID
+	Amount     string // 交易金额
+	Message    string
+	Subject    string
+}
+
+func (v NotifyVo) Success() bool {
+	return v.Status == Success
+}
+
+const (
+	Success = 0
+	Failure = 1
+)

api/service/payment/wepay_service.go

@@ -0,0 +1,135 @@
+package payment
+
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// * Copyright 2023 The Geek-AI Authors. All rights reserved.
+// * Use of this source code is governed by a Apache-2.0 license
+// * that can be found in the LICENSE file.
+// * @Author yangjian102621@163.com
+// * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+import (
+	"context"
+	"fmt"
+	"geekai/core/types"
+	"github.com/go-pay/gopay"
+	"github.com/go-pay/gopay/wechat/v3"
+	"net/http"
+	"time"
+)
+
+type WechatPayService struct {
+	config *types.WechatPayConfig
+	client *wechat.ClientV3
+}
+
+func NewWechatService(appConfig *types.AppConfig) (*WechatPayService, error) {
+	config := appConfig.WechatPayConfig
+	if !config.Enabled {
+		logger.Info("Disabled WechatPay service")
+		return nil, nil
+	}
+	priKey, err := readKey(config.PrivateKey)
+	if err != nil {
+		return nil, fmt.Errorf("error with read App Private key: %v", err)
+	}
+
+	client, err := wechat.NewClientV3(config.MchId, config.SerialNo, config.ApiV3Key, priKey)
+	if err != nil {
+		return nil, fmt.Errorf("error with initialize WechatPay service: %v", err)
+	}
+	err = client.AutoVerifySign()
+	if err != nil {
+		return nil, fmt.Errorf("error with autoVerifySign: %v", err)
+	}
+	//client.DebugSwitch = gopay.DebugOn
+
+	return &WechatPayService{config: &config, client: client}, nil
+}
+
+func (s *WechatPayService) PayUrlNative(outTradeNo string, amount int, subject string) (string, error) {
+	expire := time.Now().Add(10 * time.Minute).Format(time.RFC3339)
+	// 初始化 BodyMap
+	bm := make(gopay.BodyMap)
+	bm.Set("appid", s.config.AppId).
+		Set("mchid", s.config.MchId).
+		Set("description", subject).
+		Set("out_trade_no", outTradeNo).
+		Set("time_expire", expire).
+		Set("notify_url", s.config.NotifyURL).
+		SetBodyMap("amount", func(bm gopay.BodyMap) {
+			bm.Set("total", amount).
+				Set("currency", "CNY")
+		})
+
+	wxRsp, err := s.client.V3TransactionNative(context.Background(), bm)
+	if err != nil {
+		return "", fmt.Errorf("error with client v3 transaction Native: %v", err)
+	}
+	if wxRsp.Code != wechat.Success {
+		return "", fmt.Errorf("error status with generating pay url: %v", wxRsp.Error)
+	}
+	return wxRsp.Response.CodeUrl, nil
+}
+
+func (s *WechatPayService) PayUrlH5(outTradeNo string, amount int, subject string, ip string) (string, error) {
+	expire := time.Now().Add(10 * time.Minute).Format(time.RFC3339)
+	// 初始化 BodyMap
+	bm := make(gopay.BodyMap)
+	bm.Set("appid", s.config.AppId).
+		Set("mchid", s.config.MchId).
+		Set("description", subject).
+		Set("out_trade_no", outTradeNo).
+		Set("time_expire", expire).
+		Set("notify_url", s.config.NotifyURL).
+		SetBodyMap("amount", func(bm gopay.BodyMap) {
+			bm.Set("total", amount).
+				Set("currency", "CNY")
+		}).
+		SetBodyMap("scene_info", func(bm gopay.BodyMap) {
+			bm.Set("payer_client_ip", ip).
+				SetBodyMap("h5_info", func(bm gopay.BodyMap) {
+					bm.Set("type", "Wap")
+				})
+		})
+
+	wxRsp, err := s.client.V3TransactionH5(context.Background(), bm)
+	if err != nil {
+		return "", fmt.Errorf("error with client v3 transaction H5: %v", err)
+	}
+	if wxRsp.Code != wechat.Success {
+		return "", fmt.Errorf("error with generating pay url: %v", wxRsp.Error)
+	}
+	return wxRsp.Response.H5Url, nil
+}
+
+type NotifyResponse struct {
+	Code    string `json:"code"`
+	Message string `xml:"message"`
+}
+
+// TradeVerify 交易验证
+func (s *WechatPayService) TradeVerify(request *http.Request) NotifyVo {
+	notifyReq, err := wechat.V3ParseNotify(request)
+	if err != nil {
+		return NotifyVo{Status: 1, Message: fmt.Sprintf("error with client v3 parse notify: %v", err)}
+	}
+
+	// TODO: 这里验签程序有 Bug，一直报错：crypto/rsa: verification error，先暂时取消验签
+	//err = notifyReq.VerifySignByPK(s.client.WxPublicKey())
+	//if err != nil {
+	//	return fmt.Errorf("error with client v3 verify sign: %v", err)
+	//}
+
+	// 解密支付密文，验证订单信息
+	result, err := notifyReq.DecryptPayCipherText(s.config.ApiV3Key)
+	if err != nil {
+		return NotifyVo{Status: Failure, Message: fmt.Sprintf("error with client v3 decrypt: %v", err)}
+	}
+
+	return NotifyVo{
+		Status:     Success,
+		OutTradeNo: result.OutTradeNo,
+		TradeId:    result.TransactionId,
+		Amount:     fmt.Sprintf("%.2f", float64(result.Amount.Total)/100),
+	}
+}