liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix jd test error

Browse Source
This commit is contained in:
gazebo
2019-05-09 09:52:55 +08:00
parent 89b285da53
commit a3aad5b126
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformapi/jdapi/callback.go
View File

@@ -36,7 +36,7 @@ const (
OrderStatusUserApplyCancel = "20030" // 这个其实不是一个状态，是一个动作
OrderStatusLocked = "20010"
OrderStatusUnlocked = "20050"
OrderStatusInfoChanged = "1"
OrderStatusInfoChanged = "1" // 订单信息变更消息
OrderStatusPayFinishedSettle = "330901" // 订单支付完成应结
OrderStatusAdjustSettle = "330902" // 订单调整后应结
@@ -80,7 +80,7 @@ const (
const (
// 订单
CallbackMsgDeliveryCarrierModify = "deliveryCarrierModify" // 订单转自送消息
CallbackMsgDeliveryCarrierModify = "deliveryCarrierModify" // 订单转自送消息（是指转自送成功后，用处不大）
CallbackMsgOrderAccounting = "orderAccounting" // 订单应结消息
// 账务

8
platformapi/jdapi/order_test.go
View File

@@ -50,7 +50,7 @@ func TestOrderQuery(t *testing.T) {
func TestGetOrderCallbackMsg(t *testing.T) {
callbackStr := "timestamp=2018-06-27+12%3A43%3A51&sign=84096ADFAB81E224D6231269AD1F6AAB&v=1.0&jd_param_json=%7B%22billId%22%3A%22815338526000221%22%2C%22statusId%22%3A%2232000%22%2C%22timestamp%22%3A%222018-06-27+12%3A42%3A34%22%7D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json"
result, resp := api.GetOrderCallbackMsg([]byte(callbackStr))
result, resp := api.GetOrderCallbackMsg(utils.BuildRequest(http.MethodPost, "", callbackStr, ""))
if resp != nil {
t.Fatal(resp)
@@ -60,7 +60,7 @@ func TestGetOrderCallbackMsg(t *testing.T) {
func TestGetOrderDeliveryCallbackMsg(t *testing.T) {
callbackStr := "timestamp=2018-06-27%2B09%253A08%253A41&sign=54D9A8515BB5650DC3B81366E3286570&v=1.0&jd_param_json=%257B%2522createPin%2522%253A%2522JD_21134dac1c251d2%2522%252C%2522deliveryCarrierName%2522%253A%2522%25E8%25BE%25BE%25E8%25BE%25BE%25E4%25B8%2593%25E9%2580%2581%2522%252C%2522deliveryCarrierNo%2522%253A%25229966%2522%252C%2522deliveryStatus%2522%253A%252210%2522%252C%2522deliveryStatusTime%2522%253A%25222018-06-27%2B09%253A08%253A41%2522%252C%2522inputTime%2522%253A%25222018-06-27%2B09%253A08%253A41%2522%252C%2522orderId%2522%253A%2522815324888000121%2522%257D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json"
result, resp := api.GetOrderDeliveryCallbackMsg([]byte(callbackStr))
result, resp := api.GetOrderDeliveryCallbackMsg(utils.BuildRequest(http.MethodPost, "", callbackStr, ""))
if resp != nil {
t.Fatal(resp)
@@ -70,7 +70,7 @@ func TestGetOrderDeliveryCallbackMsg(t *testing.T) {
func TestGetOrderApplyCancelCallbackMsg(t *testing.T) {
callbackStr := "timestamp=2018-06-27%2B13%253A35%253A29&sign=F1398D658514D8864FFB56F5EF2C4792&v=1.0&jd_param_json=%257B%2522billId%2522%253A%2522815339944000322%2522%252C%2522remark%2522%253A%2522%25E5%2595%2586%25E5%25AE%25B6%25E7%25BC%25BA%25E8%25B4%25A7%2522%252C%2522statusId%2522%253A%252220030%2522%252C%2522timestamp%2522%253A%25222018-06-27%2B13%253A35%253A24%2522%257D&token=91633f2a-c5f5-4982-a925-a220d19095c3&app_key=1dba76d40cac446ca500c0391a0b6c9d&format=json"
result, resp := api.GetOrderApplyCancelCallbackMsg([]byte(callbackStr))
result, resp := api.GetOrderApplyCancelCallbackMsg(utils.BuildRequest(http.MethodPost, "", callbackStr, ""))
if resp != nil {
t.Fatal(resp)
@@ -195,7 +195,7 @@ func TestDeliveryEndOrder(t *testing.T) {
}
func TestGetAfsService(t *testing.T) {
result, err := api.GetAfsService2("22520782")
result, err := api.GetAfsService2("22534674")
if err != nil {
t.Fatal(err.Error())
}

10
utils/utils.go
View File

@@ -182,14 +182,18 @@ func GenerateGetURL(baseURL, apiStr string, params map[string]interface{}) strin
return baseURL + queryString
}
func SendFakeRequest(method, url, body, contentType string) (*http.Response, error) {
request, _ := http.NewRequest(method, url, strings.NewReader(body))
func BuildRequest(method, url, body, contentType string) (request *http.Request) {
request, _ = http.NewRequest(method, url, strings.NewReader(body))
if contentType == "" {
contentType = "application/x-www-form-urlencoded"
}
request.Header.Set("Content-Type", contentType)
return request
}
func SendFakeRequest(method, url, body, contentType string) (*http.Response, error) {
client := &http.Client{}
return client.Do(request)
return client.Do(BuildRequest(method, url, body, contentType))
}
// 过滤 utf8mb4（比如emoji表情）