1

2023-03-01 16:06:48 +08:00
parent a0c0c8a6c1 274a127c31
commit ea89791bb6
22 changed files with 224 additions and 178 deletions
--- a/platformapi/tiktok_shop/tiktok_api/api_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/api_test.go
@@ -21,7 +21,11 @@ func TestApi(t *testing.T) {
 }

 func TestQueryOrderDetail(t *testing.T) {
+<<<<<<< HEAD
 	data, err := a.GetTiktokOrderDetail("5039319444977829100")
+=======
+	data, err := a.GetTiktokOrderDetail("5038446046747543348")
+>>>>>>> 274a127c31b27012875473bbf10ff3d6f8857771
 	globals.SugarLogger.Debugf("=====%s", utils.Format4Output(data, false))
 	globals.SugarLogger.Debugf("=====%s", err)
 }
--- a/platformapi/tiktok_shop/tiktok_api/logistics_express.go
+++ b/platformapi/tiktok_shop/tiktok_api/logistics_express.go
@@ -150,18 +150,12 @@ func (a *APIExpress) OrderStatusAndPsInfo(param map[string]interface{}) error {
 	request.Param = psInfo

 	if a.accessTokenObj == nil || a.accessTokenObj.CreateTokenData.AccessToken == "" {
-		_, createTokenErr := a.CreateToken()
-		globals.SugarLogger.Debugf("'==============createTokenErr : %s", utils.Format4Output(createTokenErr, false))
+		a.CreateToken()
 	} else if a.expiresIn < time.Now().Unix() {
-		_, RefreshToken := a.RefreshToken()
-		globals.SugarLogger.Debugf("'==============RefreshToken : %s", utils.Format4Output(RefreshToken, false))
+		a.RefreshToken()
 	}

 	result, err := request.Execute(a.accessTokenObj)
-	//globals.SugarLogger.Debugf("'==============param : %s", utils.Format4Output(request.Param, false))
-	//globals.SugarLogger.Debugf("'==============result : %s", utils.Format4Output(result, false))
-	//globals.SugarLogger.Debugf("'==============param : %s", utils.Format4Output(err, false))
-	//globals.SugarLogger.Debugf("key:%s,sercet:%s,expiresIn:%d,tokenObj :%s", a.appKey, a.appSecret, a.expiresIn, utils.Format4Output(a.accessTokenObj, false))
 	if err != nil {
 		return err
 	}
--- a/platformapi/tiktok_shop/tiktok_api/order.go
+++ b/platformapi/tiktok_shop/tiktok_api/order.go
@@ -19,7 +19,6 @@ import (
 	order_orderDetail_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_orderDetail/response"
 	order_searchList_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/order_searchList/request"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 	"math"
 	"time"
 )
@@ -311,8 +310,6 @@ func (a *API) OrderDelivering(param *order_logisticsAdd_request.OrderLogisticsAd
 	request.Param = param

 	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
 	}
@@ -467,7 +464,6 @@ func (a *API) CreateOrderCallback(orderStatus []byte) (map[string][]interface{},
 			if err := json.Unmarshal([]byte(data.Data), &create); err != nil {
 				return nil, CallbackResponseErr(false)
 			}
-			globals.SugarLogger.Debugf("CallbackShipmentInfoChange create=====%s", utils.Format4Output(create, false))
 			callbackResult[CallbackShipmentInfoChange] = append(callbackResult[CallbackShipmentInfoChange], create)
 		default:
 			return nil, CallbackResponseErr(false)
--- a/platformapi/tiktok_shop/tiktok_api/sku.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku.go
@@ -30,8 +30,6 @@ import (
 	superm_product_batchRedistributeStoreProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_batchRedistributeStoreProduct/request"
 	superm_product_createSubProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_createSubProduct/request"
 	superm_product_launchProduct_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_product_launchProduct/request"
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 	"strings"
 )

@@ -119,11 +117,9 @@ func (a *API) CreateStoreCommodity(skuParam *product_addV2_request.ProductAddV2P
 	request.Param = skuParam
 	result, err := request.Execute(a.accessTokenObj)
 	if err != nil {
-		globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s,%d,%d", result.LogId, skuParam.MainProductId, err.Error())
 		return nil, err
 	}
 	if result.Code != RequestSuccessCode {
-		globals.SugarLogger.Debugf("======CreateStoreCommodity logid: %s", utils.Format4Output(result, false))
 		return nil, errors.New(result.SubMsg)
 	}
 	return result.Data, nil
@@ -145,17 +141,14 @@ func (a *API) SyncStockBatch(param *sku_syncStockBatch_request.SkuSyncStockBatch

 // EditStoreCommodity 编辑商品
 func (a *API) EditStoreCommodity(sku *product_editV2_request.ProductEditV2Param) error {
-	globals.SugarLogger.Debugf("EditStoreCommodity ========")
 	request := product_editV2_request.New()
 	request.Param = sku

 	result, err := request.Execute(a.accessTokenObj)
 	if err != nil {
-		globals.SugarLogger.Debugf("LogId %s ,err %s", result.LogId, err.Error())
 		return err
 	}
 	if result.Code != RequestSuccessCode {
-		globals.SugarLogger.Debugf("result err := %s", utils.Format4Output(result, false))
 		return errors.New(result.SubMsg)
 	}
 	return nil
@@ -525,10 +518,8 @@ func (a *API) CreateSubProduct(mainProductId int64, storeId int64) (int64, error
 	}

 	if result.Code != RequestSuccessCode {
-		globals.SugarLogger.Debugf("=CreateSubProduct  logID ========= %s", utils.Format4Output(result, false))
 		return 0, errors.New(result.SubMsg)
 	}
-	globals.SugarLogger.Debugf("result CreateSubProduct %s", utils.Format4Output(result, false))

 	return result.Data.SubProductId, nil
 }
--- a/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_delete_test.go
@@ -52,7 +52,7 @@ func GetTiktokImgListTest(api *API, storeId, appOrgCode string, detailImg string
 }

 func TestGetSkuBrand(t *testing.T) {
-	data, err := a.GetSkuBrand(22843, "康师傅")
+	data, err := a.GetSkuBrand(23156, "娃哈哈")
 	globals.SugarLogger.Debugf("data ========= %v", data)
 	globals.SugarLogger.Debugf("data ========= %s", err)
 }
--- a/platformapi/tiktok_shop/tiktok_api/sku_test.go
+++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go
--- a/platformapi/tiktok_shop/tiktok_api/store.go
+++ b/platformapi/tiktok_shop/tiktok_api/store.go
@@ -56,8 +56,6 @@ import (
 	warehouse_list_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_list/response"
 	warehouse_setFence_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_setFence/request"
 	warehouse_unbindStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_unbindStore/request"
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 )

 //GetStoreDetail 单个获取门店信息
@@ -233,8 +231,6 @@ func (a *API) BindStoreSaleLimit(param *shop_bindStoreSaleLimit_request.ShopBind
 	request := shop_bindStoreSaleLimit_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("门店绑定限售模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("门店绑定限售模板:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -249,8 +245,6 @@ func (a *API) StoreQuerySaleLimitTemp(storeId int64) (int64, error) {
 	request := shop_getStoreSaleLimit_request.New()
 	request.Param.StoreId = storeId
 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("门店查询限售模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("门店查询限售模板:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return 0, err
 	}
@@ -268,8 +262,6 @@ func (a *API) FreightTemplateCreate(param *freightTemplate_create_request.Freigh
 	request := freightTemplate_create_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("创建运费模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("创建运费模板:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -284,9 +276,6 @@ func (a *API) FreightTemplateUpdate(param *freightTemplate_update_request.Freigh
 	request := freightTemplate_update_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("更新运费模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("更新运费模板:=%s", utils.Format4Output(response, false))
-	globals.SugarLogger.Debugf("打印param 检查======%v", utils.Format4Output(request.Param, false))
 	if err != nil {
 		return nil, err
 	}
@@ -301,8 +290,6 @@ func (a *API) BindFreightTemplate(param *shop_bindStoreFreight_request.ShopBindS
 	request := shop_bindStoreFreight_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("门店绑定运费模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("门店绑定运费模板:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -317,8 +304,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) {
 	request := shop_getStoreFreight_request.New()
 	request.Param.StoreId = storeId
 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("获取门店所有的运费模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取门店所有的运费模板:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return nil, err
 	}
@@ -327,7 +312,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) {
 	}
 	tempList := make([]int64, 0)
 	if result.Data == nil {
-		globals.SugarLogger.Debugf("绑定运费模板为空")
 		tempList = append(tempList, 0)
 		return tempList, err
 	}
@@ -341,8 +325,6 @@ func (a *API) GetStoreFreight(storeId int64) ([]int64, error) {
 func (a *API) GetStoreFreightDetail(freightId int64) (*freightTemplate_detail_response.Data, error) {
 	request := freightTemplate_detail_request.New()
 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("获取门店运费模板详情=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取门店运费模板详情:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return nil, err
 	}
@@ -357,8 +339,6 @@ 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)
-	globals.SugarLogger.Debugf("获取门店绑定的运费模板=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("获取门店绑定的运费模板:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return 0, err
 	}
@@ -378,8 +358,6 @@ func (a *API) BatchCreateWarehouse(param *warehouse_createBatch_request.Warehous
 	request := warehouse_createBatch_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("批量创建区域仓=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("批量创建区域仓:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -394,8 +372,6 @@ func (a *API) CreateWarehouse(param *warehouse_create_request.WarehouseCreatePar
 	request := warehouse_create_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("创建单个区域仓=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("创建单个区域仓:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -410,8 +386,6 @@ func (a *API) StoreBindWarehouse(param *warehouse_bindStore_request.WarehouseBin
 	request := warehouse_bindStore_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("仓库绑定门店=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("仓库绑定门店:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -443,8 +417,6 @@ func (a *API) CreateFence(param *warehouse_createFence_request.WarehouseCreateFe
 	request := warehouse_createFence_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("创建电子围栏=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("创建电子围栏:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -459,8 +431,6 @@ func (a *API) SetFence(param *warehouse_setFence_request.WarehouseSetFenceParam)
 	request := warehouse_setFence_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("更新电子围栏=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("更新电子围栏:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -489,8 +459,6 @@ func (a *API) WarehouseBindFence(param *warehouse_bindFences_request.WarehouseBi
 	request := warehouse_bindFences_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("仓库绑定电子围栏=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("仓库绑定电子围栏:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -505,8 +473,6 @@ func (a *API) GetFence(outFenceID []string) (*warehouse_getFences_response.Wareh
 	request := warehouse_getFences_request.New()
 	request.Param.OutFenceIdList = outFenceID
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 获取仓库（即门店）绑定 电子围栏信息列表=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 获取仓库（即门店）绑定 电子围栏信息列表:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -522,8 +488,6 @@ func (a *API) AddressCreate(param *address_create_request.AddressCreateParam) (*
 	request := address_create_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 门店新增查询发货地址=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 门店新增查询发货地址:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -538,8 +502,6 @@ func (a *API) GetAddressList(param *address_list_request.AddressListParam) (*add
 	request := address_list_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 分页获取商家地址列表=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 分页获取商家地址列表:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -554,8 +516,6 @@ func (a *API) GetAreasByProvince(param *address_getAreasByProvince_request.Addre
 	request := address_getAreasByProvince_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 根据省份ID获取全量四级地址=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 根据省份ID获取全量四级地址:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -570,8 +530,6 @@ func (a *API) GetProvince(param *address_getProvince_request.AddressGetProvinceP
 	request := address_getProvince_request.New()
 	request.Param = param
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 获取四级地址全量省份信息=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 获取四级地址全量省份信息:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}
@@ -586,8 +544,6 @@ func (a *API) QueryAllWarehouse(param *warehouse_list_request.WarehouseListParam
 	request := warehouse_list_request.New()
 	request.Param = param
 	result, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 查询所有的仓库=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 查询所有的仓库:=%s", utils.Format4Output(result, false))
 	if err != nil {
 		return nil, err
 	}
@@ -607,8 +563,6 @@ func (a *API) WarehouseUnbindStore(storeId []int64, outWarehouseId string) error
 	request.Param.OutWarehouseId = outWarehouseId

 	data, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf(" 仓库解绑门店接口=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf(" 仓库解绑门店接口:=%s", utils.Format4Output(data, false))
 	if err != nil {
 		return err
 	}
@@ -625,8 +579,6 @@ func (a *API) SetStorePackageFee(storeID, packageFee int64) error {
 	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
 	}
--- a/platformapi/tiktok_shop/tiktok_api/transport.go
+++ b/platformapi/tiktok_shop/tiktok_api/transport.go
@@ -14,8 +14,6 @@ import (
 	superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response"
 	superm_orderDispatcher_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_orderDispatcher/request"
 	superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request"
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 	"strings"
 )

@@ -60,8 +58,6 @@ func (a *API) SetStoreAutoCallRider(params *superm_setStoreAutoCallRider_request
 	request := superm_setStoreAutoCallRider_request.New()
 	request.Param = params
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return err
 	}
@@ -78,8 +74,6 @@ func (a *API) GetStoreAutoCallRiderInfo(storeID int64) (*superm_getStoreAutoCall
 		StoreID: storeID,
 	}
 	response, err := request.Execute(a.accessTokenObj)
-	globals.SugarLogger.Debugf("查询自动呼叫运力配置=========:%s", request.GetUrlPath())
-	globals.SugarLogger.Debugf("查询自动呼叫运力配置:=%s", utils.Format4Output(response, false))
 	if err != nil {
 		return nil, err
 	}