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

platformapi/tiktok_shop/sdk-golang/api/shop_getStorePackageFee/request/shop_getStorePackageFee_request.go

@@ -0,0 +1,50 @@
+package shop_getStorePackageFee_request
+
+import (
+	"encoding/json"
+	shop_getStorePackageFee_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_getStorePackageFee/response"
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
+)
+
+type ShopGetStorePackageFeeRequest struct {
+	doudian_sdk.BaseDoudianOpApiRequest
+	Param *ShopGetStorePackageFeeParam
+}
+
+func (c *ShopGetStorePackageFeeRequest) GetUrlPath() string {
+	return "/shop/getStorePackageFee"
+}
+
+func New() *ShopGetStorePackageFeeRequest {
+	request := &ShopGetStorePackageFeeRequest{
+		Param: &ShopGetStorePackageFeeParam{},
+	}
+	request.SetConfig(doudian_sdk.GlobalConfig)
+	request.SetClient(doudian_sdk.DefaultDoudianOpApiClient)
+	return request
+
+}
+
+func (c *ShopGetStorePackageFeeRequest) Execute(accessToken *doudian_sdk.AccessToken) (*shop_getStorePackageFee_response.ShopGetStorePackageFeeResponse, error) {
+	responseJson, err := c.GetClient().Request(c, accessToken)
+	if err != nil {
+		return nil, err
+	}
+	response := &shop_getStorePackageFee_response.ShopGetStorePackageFeeResponse{}
+	_ = json.Unmarshal([]byte(responseJson), response)
+	return response, nil
+
+}
+
+func (c *ShopGetStorePackageFeeRequest) GetParamObject() interface{} {
+	return c.Param
+}
+
+func (c *ShopGetStorePackageFeeRequest) GetParams() *ShopGetStorePackageFeeParam {
+	return c.Param
+}
+
+type ShopGetStorePackageFeeParam struct {
+	// 门店id
+	StoreId int64 `json:"store_id"`
+}

platformapi/tiktok_shop/sdk-golang/api/shop_getStorePackageFee/response/shop_getStorePackageFee_response.go

@@ -0,0 +1,18 @@
+package shop_getStorePackageFee_response
+
+import (
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
+)
+
+type ShopGetStorePackageFeeResponse struct {
+	doudian_sdk.BaseDoudianOpApiResponse
+	Data *ShopGetStorePackageFeeData `json:"data"`
+}
+type ShopGetStorePackageFeeData struct {
+	// 打包费
+	PackageFee *PackageFee `json:"package_fee"`
+}
+type PackageFee struct {
+	// 打包费，单位分 0~200
+	Amount int64 `json:"amount"`
+}

platformapi/tiktok_shop/sdk-golang/api/shop_setStorePackageFee/request/shop_setStorePackageFee_request.go

@@ -0,0 +1,52 @@
+package shop_setStorePackageFee_request
+
+import (
+	"encoding/json"
+	shop_setStorePackageFee_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_setStorePackageFee/response"
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
+)
+
+type ShopSetStorePackageFeeRequest struct {
+	doudian_sdk.BaseDoudianOpApiRequest
+	Param *ShopSetStorePackageFeeParam
+}
+
+func (c *ShopSetStorePackageFeeRequest) GetUrlPath() string {
+	return "/shop/setStorePackageFee"
+}
+
+func New() *ShopSetStorePackageFeeRequest {
+	request := &ShopSetStorePackageFeeRequest{
+		Param: &ShopSetStorePackageFeeParam{},
+	}
+	request.SetConfig(doudian_sdk.GlobalConfig)
+	request.SetClient(doudian_sdk.DefaultDoudianOpApiClient)
+	return request
+
+}
+
+func (c *ShopSetStorePackageFeeRequest) Execute(accessToken *doudian_sdk.AccessToken) (*shop_setStorePackageFee_response.ShopSetStorePackageFeeResponse, error) {
+	responseJson, err := c.GetClient().Request(c, accessToken)
+	if err != nil {
+		return nil, err
+	}
+	response := &shop_setStorePackageFee_response.ShopSetStorePackageFeeResponse{}
+	_ = json.Unmarshal([]byte(responseJson), response)
+	return response, nil
+
+}
+
+func (c *ShopSetStorePackageFeeRequest) GetParamObject() interface{} {
+	return c.Param
+}
+
+func (c *ShopSetStorePackageFeeRequest) GetParams() *ShopSetStorePackageFeeParam {
+	return c.Param
+}
+
+type ShopSetStorePackageFeeParam struct {
+	// 门店id
+	StoreId int64 `json:"store_id"`
+	// 打包费，单位分 0~200
+	PackageFee int64 `json:"package_fee"`
+}

platformapi/tiktok_shop/sdk-golang/api/shop_setStorePackageFee/response/shop_setStorePackageFee_response.go

@@ -0,0 +1,12 @@
+package shop_setStorePackageFee_response
+
+import (
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
+)
+
+type ShopSetStorePackageFeeResponse struct {
+	doudian_sdk.BaseDoudianOpApiResponse
+	Data *ShopSetStorePackageFeeData `json:"data"`
+}
+type ShopSetStorePackageFeeData struct {
+}

platformapi/tiktok_shop/tiktok_api/store.go

@@ -26,6 +26,7 @@ import (
 	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_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"
 	shop_storeSuspend_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_storeSuspend/response"
 	shop_unsuspendStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_unsuspendStore/request"
@@ -549,3 +550,21 @@ func (a *API) WarehouseUnbindStore(storeId []int64, outWarehouseId string) error
 
 	return nil
 }
+
+//  /shop/setStorePackageFee 设置门店打包费
+func (a *API) SetStorePackageFee(storeID, packageFee int64) error {
+	request := shop_setStorePackageFee_request.New()
+	request.Param.StoreId = storeID
+	request.Param.PackageFee = packageFee
+	result, err := request.Execute(a.accessTokenObj)
+	globals.SugarLogger.Debugf(" 设置门店打包费接口=========:%s", request.GetUrlPath())
+	globals.SugarLogger.Debugf(" 设置门店打包费接口:=%s", utils.Format4Output(result, false))
+	if err != nil {
+		return err
+	}
+	if result.Code != RequestSuccessCode {
+		return errors.New(result.SubMsg)
+	}
+
+	return nil
+}

platformapi/tiktok_shop/tiktok_api/store_model.go

@@ -102,7 +102,7 @@ const (
 
 	//创建围栏信息
 	//围栏形状
-	ShapeCircular = 3 //圆
+	ShapeCircular = 1 //圆
 	ShapePolygon  = 2 //多边形，各点经纬度逆时针传递
 
 )

platformapi/tiktok_shop/tiktok_api/store_test.go

@@ -7,6 +7,7 @@ import (
 	shop_editStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_editStore/request"
 	shop_storeSuspend_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_storeSuspend/request"
 	shop_unsuspendStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_unsuspendStore/request"
+	trade_createTradeLimitTemplate_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/trade_createTradeLimitTemplate/request"
 	warehouse_bindFences_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindFences/request"
 	warehouse_bindFencesByStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindFencesByStore/request"
 	warehouse_bindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_bindStore/request"
@@ -286,3 +287,26 @@ func TestUtilsTime2Date(t *testing.T) {
 	fmt.Println(utils.Time2Date(time.Now()).Add(24 * time.Hour))
 	fmt.Println(time.Now().Day())
 }
+
+func TestSetStorePackageFee(t *testing.T) {
+	err := a.SetStorePackageFee(62490423, 5) //单位 分
+	fmt.Println(err)
+}
+
+func TestCreateMinPriceTemplate(t *testing.T) {
+	param := &trade_createTradeLimitTemplate_request.TradeCreateTradeLimitTemplateParam{
+		StoreId: 62490423,
+		TradeLimitRuleRequestList: []trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{
+			{
+				TradeLimitModel: 4,
+				TradeLimitPattern: &trade_createTradeLimitTemplate_request.TradeLimitPattern{
+					Minimum: 10,
+				},
+				TradeLimitSubjectList: []int32{1, 2, 3, 4, 5, 6, 7},
+			},
+		},
+	}
+	templateID, err := a.CreateTradeLimitTemplate(param)
+	fmt.Println(templateID)
+	fmt.Println(err)
+}