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

platformapi/tiktok_shop/tiktok_api/store.go

@@ -27,6 +27,7 @@ import (
 	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_getStorePackageFee_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStorePackageFee/request"
 	shop_getStoreSaleLimit_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStoreSaleLimit/request"
 	shop_setStorePackageFee_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_setStorePackageFee/request"
 	shop_storeSuspend_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_storeSuspend/request"
@@ -283,6 +284,7 @@ func (a *API) FreightTemplateUpdate(param *freightTemplate_update_request.Freigh
 		return nil, err
 	}
 	if response.Code != RequestSuccessCode {
+		globals.SugarLogger.Debugf("FreightTemplateUpdate err====%v", response.SubMsg)
 		return nil, errors.New(response.Msg + "," + response.SubMsg)
 	}
 	return nil, nil
@@ -336,7 +338,7 @@ func (a *API) GetStoreFreightDetail(freightId int64) (*freightTemplate_detail_re
 	if result.Code != RequestSuccessCode {
 		return nil, errors.New(result.SubMsg)
 	}
-	return nil, nil
+	return result.Data, nil
 }
 
 // 获取门店绑定的运费模板
@@ -593,3 +595,21 @@ func (a *API) SetStorePackageFee(storeID, packageFee int64) error {
 
 	return nil
 }
+
+// /shop/getStorePackageFee 获取门店打包费
+func (a *API) GetStorePackageFee(storeID int64) (int64, error) {
+	request := shop_getStorePackageFee_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)
+	}
+	if result.Data == nil {
+		return 0, err
+	} else {
+		return result.Data.PackageFee.Amount, nil
+	}
+}

platformapi/tiktok_shop/tiktok_api/store_test.go

@@ -309,6 +309,13 @@ func TestSetStorePackageFee(t *testing.T) {
 	fmt.Println(err)
 }
 
+//获取门店打包费
+func TestGetStorePackageFee(t *testing.T) {
+	packageFee, err := a.GetStorePackageFee(89660033)
+	fmt.Println(packageFee)
+	fmt.Println(err)
+}
+
 //限售模板
 //创建起送价限售模板
 func TestCreateMinPriceTemplate(t *testing.T) {
@@ -341,7 +348,7 @@ func TestStoreBindSaleTemplate(t *testing.T) {
 
 //获取门店限售模板
 func TestGetStoreSaleLimit(t *testing.T) {
-	SaleLimitID, err := a.StoreQuerySaleLimitTemp(62490423)
+	SaleLimitID, err := a.StoreQuerySaleLimitTemp(89660033)
 	fmt.Println(SaleLimitID)
 	fmt.Println(err)
 }
@@ -416,9 +423,7 @@ func TestUpdateFreightTemplate(t *testing.T) {
 
 //获取门店运费模板
 func TestGetStoreBindFreight(t *testing.T) {
-	var token = `{"access_token":"e1c4333c-6e5e-4db8-83d3-173923e0815f","expires_in":1677450559,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"89d62aee-5bb3-433c-9514-e435172a3263","authority_id":""}`
+	resp, err := a.GetStoreFreight(89660033)
-	var a2 = New("7136048270014416392", "c397aa9f-3927-47c4-8cfe-4d84e02602e0", token)
-	resp, err := a2.GetStoreFreight(86794746)
 	fmt.Println(resp)
 	fmt.Println(err)
 }