From afb52e64f914b20a23dca74b721993c11401a310 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 28 Sep 2018 09:47:11 +0800
Subject: [PATCH] - fix bug when getting timestamp

---
 platformapi/ebaiapi/callback.go     | 2 +-
 platformapi/ebaiapi/ebaiapi_test.go | 2 +-
 platformapi/ebaiapi/sku.go          | 4 ++--
 platformapi/ebaiapi/sku_test.go     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platformapi/ebaiapi/callback.go b/platformapi/ebaiapi/callback.go
index 1597affe..34a0a7fb 100644
--- a/platformapi/ebaiapi/callback.go
+++ b/platformapi/ebaiapi/callback.go
@@ -95,6 +95,6 @@ func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackR
 		return nil, callbackResponse
 	}
 	msg.Cmd = request.FormValue("cmd")
-	msg.Timestamp = utils.MustInterface2Int64(request.FormValue("timestamp"))
+	msg.Timestamp = utils.Str2Int64(utils.Interface2String(request.FormValue("timestamp")))
 	return msg, nil
 }
diff --git a/platformapi/ebaiapi/ebaiapi_test.go b/platformapi/ebaiapi/ebaiapi_test.go
index 42a7bf8e..cd02e5f1 100644
--- a/platformapi/ebaiapi/ebaiapi_test.go
+++ b/platformapi/ebaiapi/ebaiapi_test.go
@@ -37,7 +37,7 @@ func TestTest(t *testing.T) {
 }
 
 func TestSign(t *testing.T) {
-	reqBody := "cmd=order.status.push&timestamp=1538045409&version=3&ticket=A3DF9D06-F1E3-5C9A-46FF-279C9A19B5ED&source=63032&body={\"order_id\":15380342248732,\"status\":9}&sign=CE817F2599F5E45736BEE6E3B350C086&encrypt="
+	reqBody := "cmd=order.create&timestamp=1538098573&version=3&ticket=F6338922-44FB-2D30-9CDA-5E9AE2604C54&source=63032&body={\"order_id\":\"15380983922052\"}&sign=E9042A52120BFD3D0B448C5F50A1BA55&encrypt="
 	kvs := strings.Split(reqBody, "&")
 	values := make(url.Values, len(kvs))
 	for _, v := range kvs {
diff --git a/platformapi/ebaiapi/sku.go b/platformapi/ebaiapi/sku.go
index c79eafb5..744a2e20 100644
--- a/platformapi/ebaiapi/sku.go
+++ b/platformapi/ebaiapi/sku.go
@@ -21,7 +21,7 @@ func (a *API) SkuCategoryList(keyword string, depth int, parentID int64) (cats [
 	return nil, err
 }
 
-// pageNo页，从1开始
+// pageNo页，从1开始，keyword不能为空，否则不会返回任何信息
 func (a *API) SkuBrandList(keyword string, pageNo int) (brands []*BrandInfo, err error) {
 	result, err := a.AccessAPI("sku.brand.list", map[string]interface{}{
 		"keyword": keyword,
@@ -35,7 +35,7 @@ func (a *API) SkuBrandList(keyword string, pageNo int) (brands []*BrandInfo, err
 		for k, v := range detail {
 			brandMap := v.(map[string]interface{})
 			brands[k] = &BrandInfo{
-				BrandID:   utils.MustInterface2Int64(brandMap["brand_id"]),
+				BrandID:   utils.Str2Int64(utils.Interface2String(brandMap["brand_id"])),
 				BrandName: utils.Interface2String(brandMap["brand_name"]),
 			}
 		}
diff --git a/platformapi/ebaiapi/sku_test.go b/platformapi/ebaiapi/sku_test.go
index ce68dc77..80665331 100644
--- a/platformapi/ebaiapi/sku_test.go
+++ b/platformapi/ebaiapi/sku_test.go
@@ -16,7 +16,7 @@ func TestSkuCategoryList(t *testing.T) {
 }
 
 func TestSkuBrandList(t *testing.T) {
-	result, err := api.SkuBrandList("", 1)
+	result, err := api.SkuBrandList("中", 1)
 	if err != nil {
 		t.Fatal(err)
 	} else {