yaotian пре 8 година
родитељ
комит
a15f64c9e7
7 измењених фајлова са 26 додато и 21 уклоњено
  1. 6 2
      mch/base/helper.go
  2. 1 1
      mch/base/tools.go
  3. 5 5
      mch/pay/pay.go
  4. 4 4
      mp/base/base.go
  5. 4 4
      mp/material/media.go
  6. 3 1
      util/error.go
  7. 3 4
      wechat.go

+ 6 - 2
mch/base/helper.go

@@ -3,13 +3,17 @@ package base
 import "fmt"
 
 const (
+	//ReturnCodeSuccess success
 	ReturnCodeSuccess = "SUCCESS"
-	ReturnCodeFail    = "FAIL"
+	//ReturnCodeFail fail
+	ReturnCodeFail = "FAIL"
 )
 
 const (
+	//ResultCodeSuccess success
 	ResultCodeSuccess = "SUCCESS"
-	ResultCodeFail    = "FAIL"
+	//ResultCodeFail fail
+	ResultCodeFail = "FAIL"
 )
 
 //Error error

+ 1 - 1
mch/base/tools.go

@@ -48,7 +48,7 @@ func FormatMapToXML(xmlWriter io.Writer, m map[string]string) (err error) {
 	return
 }
 
-// 微信支付签名.
+//Sign 微信支付签名.
 //  parameters: 待签名的参数集合
 //  apiKey:     API密钥
 //  fn:         func() hash.Hash, 如果 fn == nil 则默认用 md5.New

+ 5 - 5
mch/pay/pay.go

@@ -17,28 +17,28 @@ func NewPay(context *wxcontext.Context) *Pay {
 	return pay
 }
 
-// UnifiedOrder 统一下单.
+//UnifiedOrder 统一下单.
 func (c *Pay) UnifiedOrder(req map[string]string) (resp map[string]string, err error) {
 	return c.PostXML("https://api.mch.weixin.qq.com/pay/unifiedorder", req, false)
 }
 
-// 查询订单.
+//OrderQuery 查询订单.
 func (c *Pay) OrderQuery(req map[string]string) (resp map[string]string, err error) {
 	return c.PostXML("https://api.mch.weixin.qq.com/pay/orderquery", req, false)
 }
 
-// 关闭订单.
+//CloseOrder 关闭订单.
 func (c *Pay) CloseOrder(req map[string]string) (resp map[string]string, err error) {
 	return c.PostXML("https://api.mch.weixin.qq.com/pay/closeorder", req, false)
 }
 
-// 申请退款.
+//Refund 申请退款.
 //  NOTE: 请求需要双向证书.
 func (c *Pay) Refund(req map[string]string) (resp map[string]string, err error) {
 	return c.PostXML("https://api.mch.weixin.qq.com/secapi/pay/refund", req, true)
 }
 
-// 查询退款.
+//RefundQuery 查询退款.
 func (c *Pay) RefundQuery(req map[string]string) (resp map[string]string, err error) {
 	return c.PostXML("https://api.mch.weixin.qq.com/pay/refundquery", req, false)
 }

+ 4 - 4
mp/base/base.go

@@ -33,14 +33,14 @@ Do:
 		target = fmt.Sprintf("%s?access_token=%s", url, accessToken)
 	}
 
-	var reponse *http.Response
-	reponse, err = http.Get(target)
+	var response *http.Response
+	response, err = http.Get(target)
 	if err != nil {
 		return
 	}
-	defer reponse.Body.Close()
+	defer response.Body.Close()
 
-	resp, err = ioutil.ReadAll(reponse.Body)
+	resp, err = ioutil.ReadAll(response.Body)
 	err = util.CheckCommonError(resp)
 	if err == util.ErrUnmarshall {
 		return

+ 4 - 4
mp/material/media.go

@@ -31,10 +31,10 @@ const (
 type Media struct {
 	util.CommonError
 
-	Type      MediaType `json:"type"`
-	MediaID   string    `json:"media_id"`
-	ThumbMediaID string `json:"thumb_media_id"`
-	CreatedAt int64     `json:"created_at"`
+	Type         MediaType `json:"type"`
+	MediaID      string    `json:"media_id"`
+	ThumbMediaID string    `json:"thumb_media_id"`
+	CreatedAt    int64     `json:"created_at"`
 }
 
 //MediaUpload 临时素材上传

+ 3 - 1
util/error.go

@@ -6,7 +6,8 @@ import (
 	"fmt"
 )
 
-var ErrUnmarshall error = errors.New("Json Unmarshal Error")
+//ErrUnmarshall err when unmarshall
+var ErrUnmarshall = errors.New("Json Unmarshal Error")
 
 //CommonError 微信返回的错误信息
 type CommonError struct {
@@ -14,6 +15,7 @@ type CommonError struct {
 	ErrMsg  string `json:"errmsg"`
 }
 
+//NewCommonError new CommonError
 func NewCommonError(code int64, msg string) *CommonError {
 	return &CommonError{ErrCode: code, ErrMsg: msg}
 }

+ 3 - 4
wechat.go

@@ -1,5 +1,4 @@
-/* package gowechat 一个简单易用的wechat封装.
- */
+//Package gowechat 一个简单易用的wechat封装.
 package gowechat
 
 import (
@@ -46,7 +45,7 @@ func initContext(cfg wxcontext.Config, context *wxcontext.Context) {
 	}
 }
 
-//Mch 商户平台
+//MchMgr 商户平台
 func (wc *Wechat) MchMgr() (mch *MchMgr, err error) {
 	err = wc.checkCfgMch()
 	if err != nil {
@@ -57,7 +56,7 @@ func (wc *Wechat) MchMgr() (mch *MchMgr, err error) {
 	return
 }
 
-//Mp 公众平台
+//MpMgr 公众平台
 func (wc *Wechat) MpMgr() (mp *MpMgr, err error) {
 	err = wc.checkCfgBase()
 	if err != nil {