mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-12 00:32:26 +08:00
支付 新增 BridgeConfig 方法,可获得 prepay ID,及js支付时所需要的参数
统一下单 新增非必传参数
This commit is contained in:
30
pay/pay.go
30
pay/pay.go
@@ -110,9 +110,6 @@ func (pcf *Pay) BridgeConfig(p *Params) (cfg Config, err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if p.SignType == "" {
|
|
||||||
p.SignType = "MD5"
|
|
||||||
}
|
|
||||||
buffer.WriteString("appId=")
|
buffer.WriteString("appId=")
|
||||||
buffer.WriteString(order.AppID)
|
buffer.WriteString(order.AppID)
|
||||||
buffer.WriteString("&nonceStr=")
|
buffer.WriteString("&nonceStr=")
|
||||||
@@ -144,6 +141,15 @@ func (pcf *Pay) BridgeConfig(p *Params) (cfg Config, err error) {
|
|||||||
// PrePayOrder return data for invoke wechat payment
|
// PrePayOrder return data for invoke wechat payment
|
||||||
func (pcf *Pay) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
|
func (pcf *Pay) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
|
||||||
nonceStr := util.RandomStr(32)
|
nonceStr := util.RandomStr(32)
|
||||||
|
notifyURL := pcf.PayNotifyURL
|
||||||
|
// 签名类型
|
||||||
|
if p.SignType == "" {
|
||||||
|
p.SignType = "MD5"
|
||||||
|
}
|
||||||
|
// 通知地址
|
||||||
|
if p.NotifyURL != "" {
|
||||||
|
notifyURL = p.NotifyURL
|
||||||
|
}
|
||||||
param := make(map[string]interface{})
|
param := make(map[string]interface{})
|
||||||
param["appid"] = pcf.AppID
|
param["appid"] = pcf.AppID
|
||||||
param["body"] = p.Body
|
param["body"] = p.Body
|
||||||
@@ -153,19 +159,11 @@ func (pcf *Pay) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
|
|||||||
param["spbill_create_ip"] = p.CreateIP
|
param["spbill_create_ip"] = p.CreateIP
|
||||||
param["total_fee"] = p.TotalFee
|
param["total_fee"] = p.TotalFee
|
||||||
param["trade_type"] = p.TradeType
|
param["trade_type"] = p.TradeType
|
||||||
param["openid"] = p.OpenIDÒ
|
param["openid"] = p.OpenID
|
||||||
param["detail"] = p.Detail
|
param["detail"] = p.Detail
|
||||||
param["attach"] = p.Attach
|
param["attach"] = p.Attach
|
||||||
param["goods_tag"] = p.GoodsTag
|
param["goods_tag"] = p.GoodsTag
|
||||||
param["notify_url"] = pcf.PayNotifyURL
|
param["notify_url"] = notifyURL
|
||||||
// 签名类型
|
|
||||||
if p.SignType != "" {
|
|
||||||
param["sign_type"] = p.SignType
|
|
||||||
}
|
|
||||||
// 通知地址
|
|
||||||
if p.NotifyURL != "" {
|
|
||||||
param["notify_url"] = p.NotifyURL
|
|
||||||
}
|
|
||||||
|
|
||||||
bizKey := "&key=" + pcf.PayKey
|
bizKey := "&key=" + pcf.PayKey
|
||||||
str := orderParam(param, bizKey)
|
str := orderParam(param, bizKey)
|
||||||
@@ -179,9 +177,13 @@ func (pcf *Pay) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
|
|||||||
OutTradeNo: p.OutTradeNo,
|
OutTradeNo: p.OutTradeNo,
|
||||||
TotalFee: p.TotalFee,
|
TotalFee: p.TotalFee,
|
||||||
SpbillCreateIP: p.CreateIP,
|
SpbillCreateIP: p.CreateIP,
|
||||||
NotifyURL: pcf.PayNotifyURL,
|
NotifyURL: notifyURL,
|
||||||
TradeType: p.TradeType,
|
TradeType: p.TradeType,
|
||||||
OpenID: p.OpenID,
|
OpenID: p.OpenID,
|
||||||
|
SignType: p.SignType,
|
||||||
|
Detail: p.Detail,
|
||||||
|
Attach: p.Attach,
|
||||||
|
GoodsTag: p.GoodsTag,
|
||||||
}
|
}
|
||||||
rawRet, err := util.PostXML(payGateway, request)
|
rawRet, err := util.PostXML(payGateway, request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user