Skip to content

Commit 50b8d19

Browse files
committed
fix: rename conbineURI to combineURI
1 parent 94ab98c commit 50b8d19

8 files changed

+12
-11
lines changed

order/get_order.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type GetOrderResponse struct {
5050
// GetOrder 查询订单发货状态
5151
func (cli *Order) GetOrder(req *GetOrderRequest) (*GetOrderResponse, error) {
5252

53-
url, err := cli.conbineURI("/wxa/sec/order/get_order", nil, true)
53+
url, err := cli.combineURI("/wxa/sec/order/get_order", nil, true)
5454
if err != nil {
5555
return nil, err
5656
}

order/get_order_list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type GetOrderListResponse struct {
2525
// GetOrderList 查询订单列表
2626
func (cli *Order) GetOrderList(req *GetOrderListRequest) (*GetOrderListResponse, error) {
2727

28-
url, err := cli.conbineURI("/wxa/sec/order/get_order_list", nil, true)
28+
url, err := cli.combineURI("/wxa/sec/order/get_order_list", nil, true)
2929
if err != nil {
3030
return nil, err
3131
}

order/is_trade_managed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type IsTradeManagedResponse struct {
1414
// IsTradeManaged 查询小程序是否已开通发货信息管理服务
1515
func (cli *Order) IsTradeManaged(req *IsTradeManagedRequest) (*IsTradeManagedResponse, error) {
1616

17-
url, err := cli.conbineURI("/wxa/sec/order/is_trade_managed", nil, true)
17+
url, err := cli.combineURI("/wxa/sec/order/is_trade_managed", nil, true)
1818
if err != nil {
1919
return nil, err
2020
}

order/notify_confirm_receive.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type NotifyConfirmReceiveRequest struct {
1414
// NotifyConfirmReceive 确认收货提醒接口
1515
func (cli *Order) NotifyConfirmReceive(req *IsTradeManagedRequest) (*request.CommonError, error) {
1616

17-
url, err := cli.conbineURI("/wxa/sec/order/notify_confirm_receive", nil, true)
17+
url, err := cli.combineURI("/wxa/sec/order/notify_confirm_receive", nil, true)
1818
if err != nil {
1919
return nil, err
2020
}

order/order.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ type Order struct {
66
request *request.Request
77
// 组成完整的 URL 地址
88
// 默认包含 AccessToken
9-
conbineURI func(url string, req interface{}, withToken bool) (string, error)
9+
combineURI func(url string, req interface{}, withToken bool) (string, error)
1010
}
1111

12-
func NewOrder(request *request.Request, conbineURI func(url string, req interface{}, withToken bool) (string, error)) *Order {
12+
func NewOrder(request *request.Request, combineURI func(url string, req interface{}, withToken bool) (string, error)) *Order {
1313
return &Order{
1414
request: request,
15-
conbineURI: conbineURI,
15+
combineURI: combineURI,
1616
}
1717
}

order/set_msg_jump_path.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type SetMsgJumpPathRequest struct {
99
// SetMsgJumpPath 消息跳转路径设置接口
1010
func (cli *Order) SetMsgJumpPath(req *SetMsgJumpPathRequest) (*request.CommonError, error) {
1111

12-
url, err := cli.conbineURI("/wxa/sec/order/set_msg_jump_path", nil, true)
12+
url, err := cli.combineURI("/wxa/sec/order/set_msg_jump_path", nil, true)
1313
if err != nil {
1414
return nil, err
1515
}

order/upload_shipping_info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type UploadShippingInfoRequest struct {
4040
// UploadShippingInfo 发货信息录入接口
4141
func (cli *Order) UploadShippingInfo(req *UploadShippingInfoRequest) (*request.CommonError, error) {
4242

43-
url, err := cli.conbineURI("/wxa/sec/order/upload_shipping_info", nil, true)
43+
url, err := cli.combineURI("/wxa/sec/order/upload_shipping_info", nil, true)
4444
if err != nil {
4545
return nil, err
4646
}

weapp.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package weapp
22

33
import (
4-
"github.com/medivhzhan/weapp/v3/order"
54
"log"
65
"net/http"
76
"os"
87
"time"
98

9+
"github.com/medivhzhan/weapp/v3/order"
10+
1011
"github.com/medivhzhan/weapp/v3/auth"
1112
"github.com/medivhzhan/weapp/v3/cache"
1213
"github.com/medivhzhan/weapp/v3/livebroadcast"
@@ -301,5 +302,5 @@ func (cli *Client) NewPhonenumber() *phonenumber.Phonenumber {
301302

302303
// NewOrder 发货内容管理
303304
func (cli *Client) NewOrder() *order.Order {
304-
return order.NewOrder(cli.request, cli.conbineURI)
305+
return order.NewOrder(cli.request, cli.combineURI)
305306
}

0 commit comments

Comments
 (0)