Merge pull request #637 from ArtisanCloud/develop

Develop

Author: Matrix-X

go.mod

@@ -1,6 +1,6 @@
 module github.com/ArtisanCloud/PowerWeChat/v3
 
-go 1.23
+go 1.23.0
 
 // replace github.com/ArtisanCloud/PowerLibs/v3 => ../PowerLibs
 
@@ -11,7 +11,7 @@ require (
 	github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7
 	github.com/go-playground/assert/v2 v2.0.1
 	github.com/pkg/errors v0.9.1
-	github.com/redis/go-redis/v9 v9.6.1
+	github.com/redis/go-redis/v9 v9.6.3
 	github.com/stretchr/testify v1.9.0
 )
 
@@ -26,7 +26,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.4.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -33,8 +33,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
-github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.6.3 h1:8Dr5ygF1QFXRxIH/m3Xg9MMG1rS8YCtAgosrsewT6i0=
+github.com/redis/go-redis/v9 v9.6.3/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
@@ -51,10 +51,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

src/basicService/media/client.go

@@ -54,25 +54,34 @@ func (comp *Client) UploadThumb(ctx context.Context, path string) (*response.Res
 // https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html
 func (comp *Client) Upload(ctx context.Context, mediaType string, path string) (*response.ResponseUploadMedia, error) {
 
-	_, err := os.Stat(path)
-	if (err != nil && os.IsExist(err)) && (err != nil && os.IsPermission(err)) {
-		return nil, errors.New(fmt.Sprintf("File does not exist, or the file is unreadable: \"%s\"", path))
+	if path == "" {
+		return nil, errors.New("path is empty")
+	}
+
+	stat, err := os.Stat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, fmt.Errorf("file does not exist: \"%s\"", path)
+		}
+		if os.IsPermission(err) {
+			return nil, fmt.Errorf("permission denied for file: \"%s\"", path)
+		}
+		return nil, fmt.Errorf("unable to access file \"%s\": %w", path, err)
+	}
+	if stat.IsDir() {
+		return nil, fmt.Errorf("path is a directory, not a file: \"%s\"", path)
 	}
 
 	if !object.ContainsString(comp.AllowTypes, mediaType) {
 		return nil, errors.New(fmt.Sprintf("Unsupported media type: '%s'", mediaType))
 	}
 
-	outResponse := &response.ResponseUploadMedia{}
-	var files *object.HashMap
-	if path != "" {
-		files = &object.HashMap{
-			"media": path,
-		}
-	} else {
-		return nil, errors.New("path is empty")
+	files := &object.HashMap{
+		"media": path,
 	}
 
+	outResponse := &response.ResponseUploadMedia{}
+
 	_, err = comp.BaseClient.HttpUpload(ctx, "cgi-bin/media/upload", files, nil, &object.StringMap{
 		"type": mediaType,
 	}, nil, outResponse)

src/payment/fundApp/client.go

@@ -2,6 +2,7 @@ package fundApp
 
 import (
 	"context"
+	"fmt"
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/fundApp/request"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/payment/fundApp/response"
@@ -40,3 +41,39 @@ func (comp *Client) TransferBills(ctx context.Context, data *request.RequestTran
 
 	return result, err
 }
+
+// 商户单号查询转账单
+// https://pay.weixin.qq.com/doc/v3/merchant/4012716437
+func (comp *Client) QueryOutBill(ctx context.Context, outBillNO string) (*response.ResponseQueryOutBill, error) {
+
+	result := &response.ResponseQueryOutBill{}
+
+	endpoint := comp.Wrap(fmt.Sprintf("/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/%s", outBillNO))
+	_, err := comp.SafeRequestV3(ctx, endpoint, nil, http.MethodPost, &object.HashMap{}, nil, result)
+
+	return result, err
+}
+
+// 微信单号查询转账单
+// https://pay.weixin.qq.com/doc/v3/merchant/4012716457
+func (comp *Client) QueryTransferBill(ctx context.Context, transferBillNO string) (*response.ResponseQueryTransferBill, error) {
+
+	result := &response.ResponseQueryTransferBill{}
+
+	endpoint := comp.Wrap(fmt.Sprintf("/v3/fund-app/mch-transfer/transfer-bills/transfer-bill-no/%s", transferBillNO))
+	_, err := comp.SafeRequestV3(ctx, endpoint, nil, http.MethodPost, &object.HashMap{}, nil, result)
+
+	return result, err
+}
+
+// 撤销转账
+// https://pay.weixin.qq.com/doc/v3/merchant/4012716458
+func (comp *Client) Cancel(ctx context.Context, outBillNO string) (*response.ResponseCancelBill, error) {
+
+	result := &response.ResponseCancelBill{}
+
+	endpoint := comp.Wrap(fmt.Sprintf("/v3/fund-app/mch-transfer/transfer-bills/out-bill-no/%s/cancel", outBillNO))
+	_, err := comp.SafeRequestV3(ctx, endpoint, nil, http.MethodPost, &object.HashMap{}, nil, result)
+
+	return result, err
+}

src/payment/fundApp/response/responseTransferBills.go

@@ -9,10 +9,47 @@ import (
 
 type ResponseTransferBills struct {
 	response.ResponsePayment
+	OutBillNo      string `json:"out_bill_no"`
+	TransferBillNo string `json:"transfer_bill_no"`
+	CreateTime     string `json:"create_time"`
+	State          string `json:"state"`
+	FailReason     string `json:"fail_reason"`
+	PackageInfo    string `json:"package_info"`
+}
+
+type ResponseCancelBill struct {
+	OutBillNo      string `json:"out_bill_no"`
+	TransferBillNo string `json:"transfer_bill_no"`
+	State          string `json:"state"`
+	UpdateTime     string `json:"update_time"`
+}
+
+type ResponseQueryOutBill struct {
+	MchId          string `json:"mch_id"`
+	OutBillNo      string `json:"out_bill_no"`
+	TransferBillNo string `json:"transfer_bill_no"`
+	Appid          string `json:"appid"`
+	State          string `json:"state"`
+	TransferAmount int    `json:"transfer_amount"`
+	TransferRemark string `json:"transfer_remark"`
+	FailReason     string `json:"fail_reason"`
+	Openid         string `json:"openid"`
+	UserName       string `json:"user_name"`
+	CreateTime     string `json:"create_time"`
+	UpdateTime     string `json:"update_time"`
+}
+
+type ResponseQueryTransferBill struct {
+	MchId          string    `json:"mch_id"`
 	OutBillNo      string    `json:"out_bill_no"`
 	TransferBillNo string    `json:"transfer_bill_no"`
-	CreateTime     time.Time `json:"create_time"`
+	Appid          string    `json:"appid"`
 	State          string    `json:"state"`
+	TransferAmount int       `json:"transfer_amount"`
+	TransferRemark string    `json:"transfer_remark"`
 	FailReason     string    `json:"fail_reason"`
-	PackageInfo    string    `json:"package_info"`
+	Openid         string    `json:"openid"`
+	UserName       string    `json:"user_name"`
+	CreateTime     time.Time `json:"create_time"`
+	UpdateTime     time.Time `json:"update_time"`
 }