From 7309ef704d1446a4c2dbfbc937a25ba204e0757a Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Mon, 30 Dec 2024 17:56:03 +0800 Subject: [PATCH] v1.0.0 --- app/user/cmd/api/etc/main.yaml | 2 +- app/user/cmd/api/internal/logic/pay/paymentlogic.go | 2 +- app/user/cmd/api/internal/service/alipayService.go | 11 +++++------ .../cmd/api/internal/service/apirequestService.go | 2 ++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/user/cmd/api/etc/main.yaml b/app/user/cmd/api/etc/main.yaml index 6f93645..65e2561 100644 --- a/app/user/cmd/api/etc/main.yaml +++ b/app/user/cmd/api/etc/main.yaml @@ -35,7 +35,7 @@ Alipay: AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB" IsProduction: true NotifyUrl: "https://www.quannengcha.com/api/v1/pay/alipay/callback" - ReturnURL: "https://www.quannengcha.com/inquire" + ReturnURL: "https://www.quannengcha.com/report" Wxpay: AppID: "1682635136" MchID: "1682635136" diff --git a/app/user/cmd/api/internal/logic/pay/paymentlogic.go b/app/user/cmd/api/internal/logic/pay/paymentlogic.go index 0c56991..3003c02 100644 --- a/app/user/cmd/api/internal/logic/pay/paymentlogic.go +++ b/app/user/cmd/api/internal/logic/pay/paymentlogic.go @@ -81,7 +81,7 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp, prepayID, createOrderErr = l.svcCtx.WechatPayService.CreateWechatOrder(l.ctx, amount, product.ProductName, outTradeNo) } else if req.PayMethod == "alipay" { outTradeNo = l.svcCtx.AlipayService.GenerateOutTradeNo() - prepayID, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, amount, product, outTradeNo) + prepayID, createOrderErr = l.svcCtx.AlipayService.CreateAlipayOrder(l.ctx, amount, product.ProductName, outTradeNo) } else if req.PayMethod == "appleiap" { outTradeNo = l.svcCtx.ApplePayService.GenerateOutTradeNo() prepayID = l.svcCtx.ApplePayService.GetIappayAppID(product.ProductEn) diff --git a/app/user/cmd/api/internal/service/alipayService.go b/app/user/cmd/api/internal/service/alipayService.go index 79f510b..7804805 100644 --- a/app/user/cmd/api/internal/service/alipayService.go +++ b/app/user/cmd/api/internal/service/alipayService.go @@ -7,7 +7,6 @@ import ( mathrand "math/rand" "net/http" "qnc-server/app/user/cmd/api/internal/config" - "qnc-server/app/user/model" "qnc-server/pkg/lzkit/lzUtils" "strconv" "time" @@ -60,7 +59,7 @@ func (a *AliPayService) CreateAlipayAppOrder(amount float64, subject string, out } // CreateAlipayH5Order 创建支付宝H5支付订单 -func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outTradeNo string, returnUrlPath string) (string, error) { +func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outTradeNo string) (string, error) { client := a.AlipayClient totalAmount := lzUtils.ToAlipayAmount(amount) // 构造H5支付请求 @@ -71,7 +70,7 @@ func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outT TotalAmount: totalAmount, ProductCode: "QUICK_WAP_PAY", // H5支付专用产品码 NotifyURL: a.config.NotifyUrl, // 异步回调通知地址 - ReturnURL: fmt.Sprintf("%s/%s", a.config.ReturnURL, returnUrlPath), + ReturnURL: a.config.ReturnURL, }, } // 获取H5支付请求字符串，这里会签名 @@ -84,7 +83,7 @@ func (a *AliPayService) CreateAlipayH5Order(amount float64, subject string, outT } // CreateAlipayOrder 根据平台类型创建支付宝支付订单 -func (a *AliPayService) CreateAlipayOrder(ctx context.Context, amount float64, product *model.Product, outTradeNo string) (string, error) { +func (a *AliPayService) CreateAlipayOrder(ctx context.Context, amount float64, subject string, outTradeNo string) (string, error) { // 根据 ctx 中的 platform 判断平台 platform, platformOk := ctx.Value("platform").(string) if !platformOk { @@ -93,10 +92,10 @@ func (a *AliPayService) CreateAlipayOrder(ctx context.Context, amount float64, p switch platform { case "app": // 调用App支付的创建方法 - return a.CreateAlipayAppOrder(amount, product.ProductName, outTradeNo) + return a.CreateAlipayAppOrder(amount, subject, outTradeNo) case "h5": // 调用H5支付的创建方法，并传入 returnUrl - return a.CreateAlipayH5Order(amount, product.ProductName, outTradeNo, product.ProductEn) + return a.CreateAlipayH5Order(amount, subject, outTradeNo) default: return "", fmt.Errorf("不支持的支付平台: %s", platform) } diff --git a/app/user/cmd/api/internal/service/apirequestService.go b/app/user/cmd/api/internal/service/apirequestService.go index 09bc0c7..3bab55b 100644 --- a/app/user/cmd/api/internal/service/apirequestService.go +++ b/app/user/cmd/api/internal/service/apirequestService.go @@ -9,6 +9,7 @@ import ( "github.com/tidwall/gjson" "github.com/zeromicro/go-zero/core/logx" "io" + "log" "net/http" "net/url" "qnc-server/app/user/cmd/api/internal/config" @@ -363,6 +364,7 @@ func (a *ApiRequestService) ProcessG35SC01Request(params []byte) ([]byte, error) }, } resp, callApiErr := a.westDexService.CallAPI("G35SC01", request) + log.Println(string(resp)) if callApiErr != nil { return nil, callApiErr }