关闭订单

Author: fideism

pay/README.md

@@ -2,11 +2,24 @@
 
 [官方文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)
 
-
+## 目录
+- [请求参数](#请求参数)
+- [响应参数](#响应参数)
+- [实例化支付对象](#实例化支付对象)
+- [下单](#下单)
+- [查询订单](#查询订单)
+- [关闭订单](#关闭订单)
+- [撤销订单](#撤销订单)
+- [退款](#退款)
+- [查询退款](#查询退款)
 
 ### 请求参数
 
-支付内部调用参数传递类型`Params  map[string]interface{}` 
+- 支付内部调用参数传递类型`Params  map[string]interface{}` 
+- `appid` `mch_id` `nonce_str` `sign` `sign_type` 内部会自动传入
+- `spbill_create_ip` 如果外部传入参数没有，后续调用会自动获取
+- `sign_type` 外部不传入，默认`MD5`
+
 ```go
 import "github.com/fideism/golang-wechat/util"
 
@@ -61,11 +74,8 @@ payment := pay.NewPay(&config.Config{
 	})
 ```
 
-### 统一下单
-
-`spbill_create_ip` 如果外部传入参数没有，后续调用会自动获取
+### 下单
 
-`sign_type` 外部不传入，默认`MD5`
 
 ```go
 p := util.Params{
@@ -103,6 +113,28 @@ func (order *Order) Query(params base.Params) (*base.Response, error)
 payment.GetOrder().Query()
 ```
 
+### 关闭订单
+```go
+params := util.Params{
+    "out_trade_no": "202007240001",
+}
+
+func (order *Order) Close(params base.Params) (*base.Response, error)
+
+payment.GetOrder().Close()
+```
+
+### 撤销订单
+```go
+params := util.Params{
+    "out_trade_no": "202007240001",
+}
+
+func (order *Order) Reverse(params base.Params) (*base.Response, error)
+
+payment.GetOrder().Reverse()
+```
+
 ### 退款
 
 `order.`

pay/base/url.go

@@ -59,6 +59,24 @@ func GetOrderQueryURL(c *config.Config) string {
 	return OrderQueryURL
 }
 
+// GetCloseOrderURL 关闭订单
+func GetCloseOrderURL(c *config.Config) string {
+	if c.Sandbox {
+		return SandboxCloseOrderURL
+	}
+
+	return CloseOrderURL
+}
+
+// GetReverseURL 撤销订单
+func GetReverseURL(c *config.Config) string {
+	if c.Sandbox {
+		return SandboxReverseURL
+	}
+
+	return ReverseURL
+}
+
 // GetRefundURL 退款接口
 func GetRefundURL(c *config.Config) string {
 	if c.Sandbox {

pay/notify/notify.go

@@ -1,6 +1,7 @@
 package notify
 
 import (
+	"github.com/fideism/golang-wechat/pay/base"
 	"github.com/fideism/golang-wechat/pay/config"
 )
 
@@ -13,3 +14,23 @@ type Notify struct {
 func NewNotify(cfg *config.Config) *Notify {
 	return &Notify{cfg}
 }
+
+// 通知成功
+func (n *Notify) Success() (*base.Response, error) {
+	var params base.Response
+
+	params.ReturnCode = "Success"
+	params.ReturnMsg = "OK"
+
+	return &params, nil
+}
+
+// 通知不成功
+func (n *Notify) Fail(errMsg string) (*base.Response, error) {
+	var params base.Response
+
+	params.ReturnCode = "Success"
+	params.ReturnMsg = errMsg
+
+	return &params, nil
+}

pay/notify/paid.go

@@ -59,3 +59,27 @@ func (order *Order) Query(params util.Params) (*base.Response, error) {
 
 	return base.ProcessResponseXML(xmlStr)
 }
+
+// Close 关闭订单
+func (order *Order) Close(params util.Params) (*base.Response, error) {
+	params = base.Sign(params, order.Config)
+
+	xmlStr, err := base.PostWithoutCert(base.GetCloseOrderURL(order.Config), params)
+	if err != nil {
+		return nil, err
+	}
+
+	return base.ProcessResponseXML(xmlStr)
+}
+
+// Reverse 撤销订单
+func (order *Order) Reverse(params util.Params) (*base.Response, error) {
+	params = base.Sign(params, order.Config)
+
+	xmlStr, err := base.PostWithoutCert(base.GetReverseURL(order.Config), params)
+	if err != nil {
+		return nil, err
+	}
+
+	return base.ProcessResponseXML(xmlStr)
+}

pay/order/order.go

@@ -2,21 +2,15 @@ package util
 
 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
-	"encoding/pem"
-	"encoding/xml"
 	"fmt"
 	logger "github.com/fideism/golang-wechat/log"
 	"github.com/sirupsen/logrus"
 	"io"
 	"io/ioutil"
-	"log"
 	"mime/multipart"
 	"net/http"
 	"os"
-
-	"golang.org/x/crypto/pkcs12"
 )
 
 //HTTPGet get 请求
@@ -185,94 +179,3 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 	respBody, err = ioutil.ReadAll(resp.Body)
 	return
 }
-
-//PostXML perform a HTTP/POST request with XML body
-func PostXML(uri string, obj interface{}) ([]byte, error) {
-	logger.Entry().WithFields(logrus.Fields{
-		"url":  uri,
-		"data": obj,
-	}).Debug("发起微信post-xml请求")
-
-	xmlData, err := xml.Marshal(obj)
-
-	if err != nil {
-		return nil, err
-	}
-
-	body := bytes.NewBuffer(xmlData)
-	response, err := http.Post(uri, "application/xml;charset=utf-8", body)
-	if err != nil {
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, response.StatusCode)
-	}
-	return ioutil.ReadAll(response.Body)
-}
-
-//httpWithTLS CA证书
-func httpWithTLS(rootCa, key string) (*http.Client, error) {
-	var client *http.Client
-	certData, err := ioutil.ReadFile(rootCa)
-	if err != nil {
-		return nil, fmt.Errorf("unable to find cert path=%s, error=%v", rootCa, err)
-	}
-	cert := pkcs12ToPem(certData, key)
-	config := &tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-	tr := &http.Transport{
-		TLSClientConfig:    config,
-		DisableCompression: true,
-	}
-	client = &http.Client{Transport: tr}
-	return client, nil
-}
-
-//pkcs12ToPem 将Pkcs12转成Pem
-func pkcs12ToPem(p12 []byte, password string) tls.Certificate {
-	blocks, err := pkcs12.ToPEM(p12, password)
-	defer func() {
-		if x := recover(); x != nil {
-			log.Print(x)
-		}
-	}()
-	if err != nil {
-		panic(err)
-	}
-	var pemData []byte
-	for _, b := range blocks {
-		pemData = append(pemData, pem.EncodeToMemory(b)...)
-	}
-	cert, err := tls.X509KeyPair(pemData, pemData)
-	if err != nil {
-		panic(err)
-	}
-	return cert
-}
-
-//PostXMLWithTLS perform a HTTP/POST request with XML body and TLS
-func PostXMLWithTLS(uri string, obj interface{}, ca, key string) ([]byte, error) {
-	xmlData, err := xml.Marshal(obj)
-	if err != nil {
-		return nil, err
-	}
-
-	body := bytes.NewBuffer(xmlData)
-	client, err := httpWithTLS(ca, key)
-	if err != nil {
-		return nil, err
-	}
-	response, err := client.Post(uri, "application/xml;charset=utf-8", body)
-	if err != nil {
-		return nil, err
-	}
-	defer response.Body.Close()
-
-	if response.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, response.StatusCode)
-	}
-	return ioutil.ReadAll(response.Body)
-}