diff --git a/platformapi/ebaiapi/ebaiapi.go b/platformapi/ebaiapi/ebaiapi.go index 0b409cc5..1220b8e9 100644 --- a/platformapi/ebaiapi/ebaiapi.go +++ b/platformapi/ebaiapi/ebaiapi.go @@ -129,17 +129,19 @@ func (a *API) AccessAPI(cmd string, body map[string]interface{}) (retVal *Respon }) if err != nil { if codeErr, ok := err.(*utils.ErrorWithCode); ok { - if body[KeyBaiduShopID] != nil || body[KeyShopID] != nil { - shopInfoList := []string{} - for _, key := range []string{ - KeyBaiduShopID, - KeyShopID, - } { - if body[key] != nil { - shopInfoList = append(shopInfoList, fmt.Sprintf("[%s:%v]", key, body[key])) - } + appendErrList := []string{} + for _, key := range []string{ + KeyBaiduShopID, + KeyShopID, + KeySkuID, + KeyCustomSkuID, + } { + if body[key] != nil { + appendErrList = append(appendErrList, fmt.Sprintf("[%s:%v]", key, body[key])) } - err = utils.NewErrorCode(strings.Join(shopInfoList, ",")+", "+codeErr.ErrMsg(), codeErr.Code()) + } + if len(appendErrList) > 0 { + err = utils.NewErrorCode(strings.Join(appendErrList, ",")+", "+codeErr.ErrMsg(), codeErr.Code()) } } } diff --git a/platformapi/ebaiapi/shop.go b/platformapi/ebaiapi/shop.go index 32ec03cf..e025f3b1 100644 --- a/platformapi/ebaiapi/shop.go +++ b/platformapi/ebaiapi/shop.go @@ -32,6 +32,9 @@ const ( KeyShopID = "shop_id" KeyBaiduShopID = "baidu_shop_id" + KeyCustomSkuID = "custom_sku_id" + KeySkuID = "sku_id" + KeyName = "name" KeyPhone = "phone" ) diff --git a/platformapi/ebaiapi/shop_sku.go b/platformapi/ebaiapi/shop_sku.go index e2b15182..ddb2751d 100644 --- a/platformapi/ebaiapi/shop_sku.go +++ b/platformapi/ebaiapi/shop_sku.go @@ -111,8 +111,8 @@ func (a *API) SkuList(shopID string, params map[string]interface{}) (skuInfo *Pa func (a *API) SkuCreate(shopID string, customSkuID int, params map[string]interface{}) (skuID int64, err error) { defParams := map[string]interface{}{ - KeyShopID: shopID, - "custom_sku_id": customSkuID, + KeyShopID: shopID, + KeyCustomSkuID: customSkuID, } if params["upc"] == nil { defParams["upc_type"] = UPCTypePrivate @@ -128,7 +128,7 @@ func (a *API) SkuCreate(shopID string, customSkuID int, params map[string]interf // baseapi.SugarLogger.Debugf(utils.Format4Output(params, false)) result, err := a.AccessAPI("sku.create", params) if err == nil { - return utils.Str2Int64(utils.Interface2String(result.Data.(map[string]interface{})["sku_id"])), nil + return utils.Str2Int64(utils.Interface2String(result.Data.(map[string]interface{})[KeySkuID])), nil } return 0, err } @@ -136,11 +136,11 @@ func (a *API) SkuCreate(shopID string, customSkuID int, params map[string]interf func (a *API) SkuUpdate(shopID string, ebaiSkuID int64, params map[string]interface{}) (skuID int64, err error) { defParams := map[string]interface{}{ KeyShopID: shopID, - "sku_id": ebaiSkuID, + KeySkuID: ebaiSkuID, } result, err := a.AccessAPI("sku.update", utils.MergeMaps(params, defParams)) if err == nil { - return utils.Str2Int64(utils.Interface2String(result.Data.(map[string]interface{})["sku_id"])), nil + return utils.Str2Int64(utils.Interface2String(result.Data.(map[string]interface{})[KeySkuID])), nil } return 0, err } @@ -148,7 +148,7 @@ func (a *API) SkuUpdate(shopID string, ebaiSkuID int64, params map[string]interf func (a *API) SkuDelete(shopID, skuIDsStr string) (err error) { params := map[string]interface{}{ KeyShopID: shopID, - "sku_id": skuIDsStr, + KeySkuID: skuIDsStr, } _, err = a.AccessAPI("sku.delete", params) if err == nil { @@ -159,8 +159,8 @@ func (a *API) SkuDelete(shopID, skuIDsStr string) (err error) { func (a *API) SkuDeleteByCustomIDs(shopID, customSkuIDsStr string) (err error) { params := map[string]interface{}{ - KeyShopID: shopID, - "custom_sku_id": customSkuIDsStr, + KeyShopID: shopID, + KeyCustomSkuID: customSkuIDsStr, } _, err = a.AccessAPI("sku.delete", params) if err == nil { @@ -172,7 +172,7 @@ func (a *API) SkuDeleteByCustomIDs(shopID, customSkuIDsStr string) (err error) { func (a *API) SkuOnline(shopID, skuIDsStr string) (err error) { params := map[string]interface{}{ KeyShopID: shopID, - "sku_id": skuIDsStr, + KeySkuID: skuIDsStr, } _, err = a.AccessAPI("sku.online", params) if err == nil { @@ -184,7 +184,7 @@ func (a *API) SkuOnline(shopID, skuIDsStr string) (err error) { func (a *API) SkuOffline(shopID, skuIDsStr string) (err error) { params := map[string]interface{}{ KeyShopID: shopID, - "sku_id": skuIDsStr, + KeySkuID: skuIDsStr, } _, err = a.AccessAPI("sku.offline", params) if err == nil { @@ -196,7 +196,7 @@ func (a *API) SkuOffline(shopID, skuIDsStr string) (err error) { func (a *API) SkuShopCategoryMap(shopID string, skuID int64, categoryIDsStr string) (err error) { params := map[string]interface{}{ KeyShopID: shopID, - "sku_id": skuID, + KeySkuID: skuID, "category_id": categoryIDsStr, } _, err = a.AccessAPI("sku.shop.category.map", params) diff --git a/platformapi/ebaiapi/shop_sku_test.go b/platformapi/ebaiapi/shop_sku_test.go index 1207c74e..a9631343 100644 --- a/platformapi/ebaiapi/shop_sku_test.go +++ b/platformapi/ebaiapi/shop_sku_test.go @@ -49,7 +49,7 @@ func TestSkuGetItemsByCategoryId(t *testing.T) { func TestSkuList(t *testing.T) { result, err := api.SkuList(testShopID, map[string]interface{}{ - // "sku_id": 153879464137191, + // KeySkuID: 153879464137191, // "delete": 1, }) if err != nil {