diff --git a/api/service/OrderMember.go b/api/service/OrderMember.go index 979b2a6..d352e69 100644 --- a/api/service/OrderMember.go +++ b/api/service/OrderMember.go @@ -139,7 +139,7 @@ func (r *OrderMemberService) OrderRefund(tx *gorm.DB, order *model.OrderMember, Reason: refundReason, RefundAmount: int64(*refundAmount * 100), PaymentAmountTotal: int64(order.PaymentAmountTotal * 100), - NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.MemberRefundNotifyUrl, + NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.MemberRefundNotifyUrl, } refund, err := refundRequest.Refund() diff --git a/api/service/OrderSingle.go b/api/service/OrderSingle.go index c2d1d54..868a7a5 100644 --- a/api/service/OrderSingle.go +++ b/api/service/OrderSingle.go @@ -139,7 +139,7 @@ func (r *OrderSingleService) OrderRefund(tx *gorm.DB, order *model.OrderSingle, Reason: refundReason, RefundAmount: int64(*refundAmount * 100), PaymentAmountTotal: int64(order.PaymentAmountTotal * 100), - NotifyUrl: config.C.Wechat.RefundNotifyDomain + config.C.Wechat.SingleRefundNotifyUrl, + NotifyUrl: config.C.Wechat.NotifyDomain + config.C.Wechat.SingleRefundNotifyUrl, } refund, err := refundRequest.Refund() diff --git a/config.yaml b/config.yaml index 3860a0e..e96fb50 100644 --- a/config.yaml +++ b/config.yaml @@ -49,11 +49,12 @@ dysms: wechat: app-id: wx68affaa9d23528f8 app-secret: 2963c90242ddb2421c939591ad9e903d + test-pay-app-id: wxa4132ef4701ac5e4 single-pay-notify-url: callback/wxpay/single # 单项支付回调地址 single-refund-notify-url: callback/wxpay/single/refund # 单项退款回调地址 member-pay-notify-url: callback/wxpay/member # 会员支付回调地址 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: mch-id: 1281030301 v3-api-secret: sB2tCkT70uwEy7cQCu1llA6nilTbek6F diff --git a/config/wechat.go b/config/wechat.go index d74e756..9a7fd05 100644 --- a/config/wechat.go +++ b/config/wechat.go @@ -1,13 +1,14 @@ package config 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"` + 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"` // 单项支付回调地址 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"` // 会员支付回调地址 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"` }