gdxz/hepa-calc-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改支付参数

Browse Source
This commit is contained in:
wucongxing8150 2024-08-14 14:12:37 +08:00
parent 37d2b55dfb
commit 8ee4dec11d
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/service/OrderMember.go
View File

@ -288,7 +288,7 @@ func (r *OrderMemberService) GetJsapiPrepay(m *model.OrderMember) (prepay *jsapi
MchId: config.C.Wechat.Pay1281030301.MchId, MchId: config.C.Wechat.Pay1281030301.MchId,
Description: "肝病算一算", Description: "肝病算一算",
OutTradeNo: m.OrderNo, OutTradeNo: m.OrderNo,
NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.MemberRefundNotifyUrl, NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.MemberRefundNotifyUrl,
Amount: weChat.JsapiRequestAmountRequest{ Amount: weChat.JsapiRequestAmountRequest{
Total: int64(m.PaymentAmountTotal * 100), Total: int64(m.PaymentAmountTotal * 100),
Currency: "CNY", Currency: "CNY",
@ -322,7 +322,7 @@ func (r *OrderMemberService) GetAppPrepay(m *model.OrderMember) (prepay *app.Pre
MchId: config.C.Wechat.Pay1281030301.MchId, MchId: config.C.Wechat.Pay1281030301.MchId,
Description: "肝病算一算", Description: "肝病算一算",
OutTradeNo: m.OrderNo, OutTradeNo: m.OrderNo,
NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.MemberRefundNotifyUrl, NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.MemberRefundNotifyUrl,
Amount: weChat.AppRequestAmountRequest{ Amount: weChat.AppRequestAmountRequest{
Total: int64(m.PaymentAmountTotal * 100), Total: int64(m.PaymentAmountTotal * 100),
Currency: "CNY", Currency: "CNY",

8
api/service/OrderSingle.go
View File

@ -313,11 +313,11 @@ func (r *OrderSingleService) GetJsapiPrepay(m *model.OrderSingle) (prepay *jsapi
} }
jsapiRequest := weChat.JsapiRequest{ jsapiRequest := weChat.JsapiRequest{
AppId: config.C.Wechat.AppId, AppId: config.C.Wechat.TestPayAppId,
MchId: config.C.Wechat.Pay1281030301.MchId, MchId: config.C.Wechat.Pay1281030301.MchId,
Description: "肝病算一算", Description: "肝病算一算",
OutTradeNo: m.OrderNo, OutTradeNo: m.OrderNo,
NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.SingleRefundNotifyUrl, NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.SinglePayNotifyUrl,
Amount: weChat.JsapiRequestAmountRequest{ Amount: weChat.JsapiRequestAmountRequest{
Total: int64(m.PaymentAmountTotal * 100), Total: int64(m.PaymentAmountTotal * 100),
Currency: "CNY", Currency: "CNY",
@ -347,11 +347,11 @@ func (r *OrderSingleService) GetAppPrepay(m *model.OrderSingle) (prepay *app.Pre
} }
appRequest := weChat.AppRequest{ appRequest := weChat.AppRequest{
AppId: config.C.Wechat.AppId, AppId: config.C.Wechat.TestPayAppId,
MchId: config.C.Wechat.Pay1281030301.MchId, MchId: config.C.Wechat.Pay1281030301.MchId,
Description: "肝病算一算", Description: "肝病算一算",
OutTradeNo: m.OrderNo, OutTradeNo: m.OrderNo,
NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.SingleRefundNotifyUrl, NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.SingleRefundNotifyUrl,
Amount: weChat.AppRequestAmountRequest{ Amount: weChat.AppRequestAmountRequest{
Total: int64(m.PaymentAmountTotal * 100), Total: int64(m.PaymentAmountTotal * 100),
Currency: "CNY", Currency: "CNY",

3
config.yaml
View File

@ -49,11 +49,12 @@ dysms:
wechat: wechat:
app-id: wx68affaa9d23528f8 app-id: wx68affaa9d23528f8
app-secret: 2963c90242ddb2421c939591ad9e903d app-secret: 2963c90242ddb2421c939591ad9e903d
test-pay-app-id: wxa4132ef4701ac5e4
single-pay-notify-url: callback/wxpay/single # 单项支付回调地址 single-pay-notify-url: callback/wxpay/single # 单项支付回调地址
single-refund-notify-url: callback/wxpay/single/refund # 单项退款回调地址 single-refund-notify-url: callback/wxpay/single/refund # 单项退款回调地址
member-pay-notify-url: callback/wxpay/member # 会员支付回调地址 member-pay-notify-url: callback/wxpay/member # 会员支付回调地址
member-refund-notify-url: callback/wxpay/member/refund # 会员退款回调地址 member-refund-notify-url: callback/wxpay/member/refund # 会员退款回调地址
refund-notify-domain: https://dev-hepa.igandan.com/api/ notify-domain: https://dev-hepa.igandan.com/api/
pay-1281030301: pay-1281030301:
mch-id: 1281030301 mch-id: 1281030301
v3-api-secret: sB2tCkT70uwEy7cQCu1llA6nilTbek6F v3-api-secret: sB2tCkT70uwEy7cQCu1llA6nilTbek6F

5
config/wechat.go
View File

@ -1,13 +1,14 @@
package config package config
type Wechat struct { type Wechat struct {
AppId string `mapstructure:"app-id" json:"app-id" yaml:"patient-app-id"` AppId string `mapstructure:"app-id" json:"app-id" yaml:"app-id"`
AppSecret string `mapstructure:"app-secret" json:"app-secret" yaml:"app-secret"` AppSecret string `mapstructure:"app-secret" json:"app-secret" yaml:"app-secret"`
TestPayAppId string `mapstructure:"test-pay-app-id" json:"test-pay-app-id" yaml:"test-pay-app-id"`
SinglePayNotifyUrl string `mapstructure:"single-pay-notify-url" json:"single-pay-notify-url" yaml:"single-pay-notify-url"` // 单项支付回调地址 SinglePayNotifyUrl string `mapstructure:"single-pay-notify-url" json:"single-pay-notify-url" yaml:"single-pay-notify-url"` // 单项支付回调地址
SingleRefundNotifyUrl string `mapstructure:"single-refund-notify-url" json:"single-refund-notify-url" yaml:"single-refund-notify-url"` // 单项退款回调地址 SingleRefundNotifyUrl string `mapstructure:"single-refund-notify-url" json:"single-refund-notify-url" yaml:"single-refund-notify-url"` // 单项退款回调地址
MemberPayNotifyUrl string `mapstructure:"member-pay-notify-url" json:"member-pay-notify-url" yaml:"member-pay-notify-url"` // 会员支付回调地址 MemberPayNotifyUrl string `mapstructure:"member-pay-notify-url" json:"member-pay-notify-url" yaml:"member-pay-notify-url"` // 会员支付回调地址
MemberRefundNotifyUrl string `mapstructure:"member-refund-notify-url" json:"member-refund-notify-url" yaml:"member-refund-notify-url"` // 会员退款回调地址 MemberRefundNotifyUrl string `mapstructure:"member-refund-notify-url" json:"member-refund-notify-url" yaml:"member-refund-notify-url"` // 会员退款回调地址
RefundNotifyDomain string `mapstructure:"refund-notify-domain" json:"refund-notify-domain" yaml:"refund-notify-domain"` NotifyDomain string `mapstructure:"notify-domain" json:"notify-domain" yaml:"notify-domain"`
Pay1281030301 Pay1281030301 `mapstructure:"pay-1281030301" json:"pay-1281030301" yaml:"pay-1281030301"` Pay1281030301 Pay1281030301 `mapstructure:"pay-1281030301" json:"pay-1281030301" yaml:"pay-1281030301"`
} }

40
extend/weChat/prepay.go
View File

@ -6,7 +6,6 @@ import (
"github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/core"
"github.com/wechatpay-apiv3/wechatpay-go/services/payments/app" "github.com/wechatpay-apiv3/wechatpay-go/services/payments/app"
"github.com/wechatpay-apiv3/wechatpay-go/services/payments/jsapi" "github.com/wechatpay-apiv3/wechatpay-go/services/payments/jsapi"
"hepa-calc-api/utils"
) )
/** /**
@ -61,24 +60,29 @@ func (r JsapiRequest) GetJsapiPrepay() (prepay *jsapi.PrepayWithRequestPaymentRe
svc := jsapi.JsapiApiService{Client: client} svc := jsapi.JsapiApiService{Client: client}
// 得到prepay_id，以及调起支付所需的参数和签名 // 得到prepay_id，以及调起支付所需的参数和签名
resp, result, err := svc.PrepayWithRequestPayment(context.Background(), PrepayRequest := jsapi.PrepayRequest{
jsapi.PrepayRequest{ Appid: core.String(r.AppId),
Appid: core.String(r.AppId), Mchid: core.String(r.MchId),
Mchid: core.String(r.MchId), Description: core.String(r.Description),
Description: core.String(r.Description), OutTradeNo: core.String(r.OutTradeNo),
OutTradeNo: core.String(r.OutTradeNo), NotifyUrl: core.String(r.NotifyUrl),
NotifyUrl: core.String(r.NotifyUrl), Amount: &jsapi.Amount{
Amount: &jsapi.Amount{ Total: core.Int64(r.Amount.Total),
Total: core.Int64(r.Amount.Total), Currency: core.String("CNY"),
Currency: core.String("CNY"),
},
Payer: &jsapi.Payer{
Openid: core.String(r.Payer.OpenId),
},
}, },
Payer: &jsapi.Payer{
Openid: core.String(r.Payer.OpenId),
},
}
resp, result, err := svc.PrepayWithRequestPayment(context.Background(),
PrepayRequest,
) )
utils.LogJsonInfo("发起支付", *result) if err != nil {
return nil, err
}
if result.Response.StatusCode != 200 { if result.Response.StatusCode != 200 {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }
@ -118,6 +122,10 @@ func (r AppRequest) GetAppPrepay() (prepay *app.PrepayWithRequestPaymentResponse
}, },
) )
if err != nil {
return nil, err
}
if result.Response.StatusCode != 200 { if result.Response.StatusCode != 200 {
return nil, errors.New("发起支付失败") return nil, errors.New("发起支付失败")
} }