Merge branch 'master' of https://e.coding.net/rosydev/baseapi

platformapi/tiktok_shop/tiktok_api/sku.go

@@ -14,7 +14,6 @@ import (
 	product_listV2_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_listV2/response"
 	product_setOffline_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/product_setOffline/request"
 	shop_getShopCategory_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getShopCategory/request"
-	shop_getStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreFreight/request"
 	sku_syncStock_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_syncStock/request"
 	sku_syncStockBatch_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/sku_syncStockBatch/request"
 )
@@ -208,17 +207,3 @@ func (a *API) GetSkuDetailList(param *product_listV2_request.ProductListV2Param)
 
 	return result.Data, nil
 }
-
-// GetStoreFreight 获取运费模板
-func (a *API) GetStoreFreight(storeId int64) (int64, error) {
-	request := shop_getStoreFreight_request.New()
-	request.Param.StoreId = storeId
-	result, err := request.Execute(a.accessTokenObj)
-	if err != nil {
-		return 0, err
-	}
-	if result.Code != RequestSuccessCode {
-		return 0, errors.New(result.SubMsg)
-	}
-	return result.Data.StoreFreights[0].FreightId, err
-}

platformapi/tiktok_shop/tiktok_api/store.go

@@ -15,13 +15,13 @@ import (
 	shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request"
 	shop_batchCreateStore_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/response"
 	shop_bindStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreFreight/request"
-	shop_bindStoreFreight_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreFreight/response"
 	shop_bindStoreSaleLimit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreSaleLimit/request"
 	shop_bindStoreSaleLimit_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_bindStoreSaleLimit/response"
 	shop_editStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_editStore/request"
 	shop_editStore_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_editStore/response"
 	shop_getStoreDetail_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreDetail/request"
 	shop_getStoreDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreDetail/response"
+	shop_getStoreFreight_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreFreight/request"
 	shop_getStoreList_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreList/request"
 	shop_getStoreList_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreList/response"
 	shop_storeSuspend_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_storeSuspend/request"
@@ -174,17 +174,53 @@ func (a *API) FreightTemplateCreate(param *freightTemplate_create_request.Freigh
 }
 
 // 门店绑定运费模板 1对1
-func (a *API) BindFreightTemplate(param *shop_bindStoreFreight_request.ShopBindStoreFreightParam) (*shop_bindStoreFreight_response.ShopBindStoreFreightData, error) {
+func (a *API) BindFreightTemplate(param *shop_bindStoreFreight_request.ShopBindStoreFreightParam) error {
 	request := shop_bindStoreFreight_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	if response.Code != RequestSuccessCode {
-		return nil, errors.New(response.SubMsg)
+		return errors.New(response.SubMsg)
 	}
-	return response.Data, nil
+	return nil
+}
+
+// GetStoreFreight 获取门店所有的运费模板
+func (a *API) GetStoreFreight(storeId int64) ([]int64, error) {
+	request := shop_getStoreFreight_request.New()
+	request.Param.StoreId = storeId
+	result, err := request.Execute(a.accessTokenObj)
+	if err != nil {
+		return nil, err
+	}
+	if result.Code != RequestSuccessCode {
+		return nil, errors.New(result.SubMsg)
+	}
+
+	tempList := make([]int64, 0)
+	for _, v := range result.Data.StoreFreights {
+		tempList = append(tempList, v.FreightId)
+	}
+	return tempList, err
+}
+
+// 获取门店绑定的运费模板
+func (a *API) GetStoreBindTemp(storeId int64) (freightId int64, err error) {
+	request := shop_getStoreFreight_request.New()
+	request.Param.StoreId = storeId
+	result, err := request.Execute(a.accessTokenObj)
+	if err != nil {
+		return 0, err
+	}
+
+	for _, v := range result.Data.StoreFreights {
+		if v.StoreId == storeId {
+			return v.FreightId, nil
+		}
+	}
+	return 0, nil
 }
 
 // 批量创建区域仓

platformapi/tiktok_shop/tiktok_api/store_test.go

@@ -22,7 +22,7 @@ func TestCreateStore(t *testing.T) {
 		Address:   "成都市金牛区市政府旁",
 		Contact:   "18981810340",
 		OpenTime: &shop_batchCreateStore_request.OpenTime{DayMap: map[int64]string{
-			1: "07:00-12:00,13:00-18:00",
+			1: "07:00-12:00 14:00-18:00",
 		}},
 	}
 	paramList := &shop_batchCreateStore_request.ShopBatchCreateStoreParam{}
@@ -31,3 +31,7 @@ func TestCreateStore(t *testing.T) {
 	fmt.Println("data==", data)
 	fmt.Println("err==", err)
 }
+
+func TestSysnc(t *testing.T) {
+	fmt.Println((2 & 2) != 0) // 创建
+}