liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
richboo111
2023-03-01 16:06:48 +08:00
parent a0c0c8a6c1 274a127c31
commit ea89791bb6
22 changed files with 224 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformapi/ebaiapi/shop_sku.go
View File

@@ -2,7 +2,6 @@ package ebaiapi
import (
"fmt"
"git.rosy.net.cn/jx-callback/globals"
"regexp"
"strings"
@@ -250,7 +249,6 @@ func (a *API) ShopCategoryGet(shopID string) (cats []*CategoryInfo, err error) {
return cats, nil
}
}
globals.SugarLogger.Debugf("ShopCategoryGet err====%v", err)
return nil, err
}
@@ -316,7 +314,6 @@ func (a *API) SkuCreate(trackInfo, shopID string, customSkuID int64, params map[
if err == nil && result.Data != nil {
return utils.Interface2Int64WithDefault(result.Data.(map[string]interface{})[KeySkuID], 0), nil
}
globals.SugarLogger.Debugf("SkuCreate err====%v", err)
return 0, err
}
@@ -329,7 +326,6 @@ func (a *API) SkuUpdate(trackInfo, shopID string, ebaiSkuID int64, params map[st
if err == nil {
return utils.Interface2Int64WithDefault(result.Data.(map[string]interface{})[KeySkuID], 0), nil
}
globals.SugarLogger.Debugf("SkuUpdate err====%v", err)
return 0, err
}

1
platformapi/jdapi/jdapi.go
View File

@@ -301,7 +301,6 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k
return utils.DictKeysMan(result, keyToRemove, keyToKeep), nil
}
err = platformapi.RebuildError(err, jdParams, watchKeys)
baseapi.SugarLogger.Infof("AccessAPINoPage failed, apiStr:%s, jdParams:%s, data:%s, error:%v", apiStr, utils.Format4Output(jdParams, true), utils.Format4Output(jsonResult, true), err)
return result, err
}

2
platformapi/jdapi/jdapi_test.go
View File

@@ -216,8 +216,6 @@ func TestStringTo(t *testing.T) {
globals.SugarLogger.Debugf("==============err := %s", err.Error())
}
globals.SugarLogger.Debugf("=data :=%s", utils.Format4Output(result0, false))
}
func TestDecode(t *testing.T) {

11
platformapi/jdapi/store.go
View File

@@ -397,6 +397,17 @@ func (a *API) OrgReplyComment(orderID int64, storeID, content, replayPin string)
return err
}
// 根据城市编码查询区域信息列表接口
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=194&apiid=cc2a3b5d49e84f3eb41ee39a0afe33c3
func (a *API) GetNextLevelByType(areaCode int64, pin string) (interface{}, error) {
jdParams := map[string]interface{}{
"areaCode": areaCode,
"pin": pin,
}
result, err := a.AccessAPI("address/getNextLevelByType", jdParams)
return result, err
}
// 根据到家门店编码修改商家自动接单接口
// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=194&apiid=5df446bb5ff14413965b8d702718dc48
func (a *API) UpdateStoreConfig4Open(stationNo string, isAutoOrder bool) (bool, error) {

15
platformapi/jdapi/store_page_test.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"strings"
"testing"
)
@@ -210,7 +211,7 @@ func TestC(t *testing.T) {
//}
//
func TestGetJdUpcCodeByName(t *testing.T) {
result, err := api.GetJdUpcCodeByName("", "9556771007300", 1, 5)
result, err := api.GetJdUpcCodeByName("", "6909931247116", 1, 5)
if err != nil {
t.Fatal(err)
}
@@ -218,6 +219,18 @@ func TestGetJdUpcCodeByName(t *testing.T) {
t.Log(utils.Format4Output(result, false))
}
func TestGetAllCities(t *testing.T) {
citys, err := api.GetAllCities()
globals.SugarLogger.Debug("=========err %v", err)
globals.SugarLogger.Debug("=========len %d", len(citys))
for _, v := range citys {
if v.AreaName == "通辽市" {
}
globals.SugarLogger.Debugf("=========data %s", utils.Format4Output(v, false))
}
}
//func TestGetJdSkuDirectPrice(t *testing.T) {
// result, err := api.GetJdSkuDirectPrice(31031)
// fmt.Println("test1", result, err)

59
platformapi/jdapi/store_test.go
View File

@@ -49,36 +49,35 @@ func TestGetStoreInfoByStationNo(t *testing.T) {
}
//
//func TestUpdateStoreInfo4Open(t *testing.T) {
// result, err := api.GetStoreInfoByStationNo2(mustExistStoreID)
// if err != nil {
// t.Fatal(err)
// }
// oldAddress := result.StationAddress
// params := &OpStoreParams{
// StationNo: mustExistStoreID,
// Operator: "test",
// StationAddress: oldAddress + "T",
// }
// err = api.UpdateStoreInfo4Open2(params, false)
// if err != nil {
// t.Fatal(err)
// }
//
// result, err = api.GetStoreInfoByStationNo2(mustExistStoreID)
// newAddress := result.StationAddress
// if newAddress != params.StationAddress {
// t.Fatalf("address not match, newAddress:%s, oldAddress:%s", newAddress, oldAddress)
// }
//
// params.StationAddress = oldAddress
// api.UpdateStoreInfo4Open2(params, false)
// if err != nil {
// t.Fatal(err)
// }
//}
//
func TestUpdateStoreInfo4Open(t *testing.T) {
params := &OpStoreParams{
StationNo: "12664100",
StationName: "旺佳超市",
OutSystemID: "668836",
Mobile: "17751816719",
Phone: "17751816719",
Lat: 43.622098,
Lng: 122.275918,
City: 902,
County: 32769,
StationAddress: "内蒙古自治区通辽市科尔沁区百花新城",
Operator: "18981810340",
ServiceTimeEnd1: 44,
ServiceTimeStart1: 14,
CoordinateType: 3,
CloseStatus: 0,
}
err := api.UpdateStoreInfo4Open2(params, false)
if err != nil {
t.Fatal(err)
}
}
func TestGetNextLevelByType(t *testing.T) {
api.GetNextLevelByType(902, "18981810")
}
//func TestGetCommentByOrderId(t *testing.T) {
// testOrderID := int64(922520919000622)
// result, err := api.GetCommentByOrderId2(testOrderID)

2
platformapi/jdshopapi/order2.go
View File

@@ -2,7 +2,6 @@ package jdshopapi
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
)
//Creat by hang At 2022-03-28
@@ -66,7 +65,6 @@ func (a *API) GetOrderById2(orderID int64, isStatus bool) (getOrderResult *GetEn
}
result, err := a.AccessAPI("jingdong.pop.oto.locorderinfo.enget", prodURL2, params)
globals.SugarLogger.Debugf("===result :%s", utils.Format4Output(result, false))
if err == nil {
utils.Map2StructByJson(result["jingdong_pop_order_enGet_responce"].(map[string]interface{})["orderDetailInfo"].(map[string]interface{})["orderInfo"], &getOrderResult, false)
}

6
platformapi/mtwmapi/mtwmapi_test.go
View File

@@ -20,13 +20,13 @@ func init() {
baseapi.Init(sugarLogger)
// 菜市
api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
//api = New("589", "a81eb3df418d83d6a1a4b7c572156d2f", "", "")
// 果园
//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
//商超
//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_nH_IlcWQKAkZBqklwItNRw") //token_nH_IlcWQKAkZBqklwItNRw
api = New("5873", "41c479790a76f86326f89e8048964739", "", "") //token_nH_IlcWQKAkZBqklwItNRw
cookieStr := `
acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1;
`
@@ -60,7 +60,7 @@ func TestGetAccessToken(t *testing.T) {
}
func TestGetAccessToken2(t *testing.T) {
result, err := api.GetAccessToken2("12422751") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg
result, err := api.GetAccessToken2("16708848") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg
if err != nil {
t.Fatal(err)
}

2
platformapi/mtwmapi/order_test.go
View File

@@ -131,7 +131,7 @@ func TestGetOrderIdByDaySeq(t *testing.T) {
}
func TestGetOrderIdByDaySeqSingle(t *testing.T) {
result, err := api.GetOrderIdByDaySeqSingle("7111597", utils.Time2Date(time.Now()), 1)
result, err := api.GetOrderIdByDaySeqSingle("16708848", utils.Time2Date(time.Now()), 1)
t.Log(utils.Format4Output(result, false))
if err != nil {
t.Fatal(err)

2
platformapi/mtwmapi/poi_test.go
View File

@@ -23,7 +23,7 @@ func TestPoiGetIDs(t *testing.T) {
}
func TestPoiMGet(t *testing.T) {
result, err := api.PoiMGet([]string{"12524795"})
result, err := api.PoiMGet([]string{"16708848"})
t.Log(utils.Format4Output(result, false))
if err != nil {
t.Fatal(err)

26
platformapi/mtwmapi/retail.go
View File

@@ -4,6 +4,7 @@ import (
"git.rosy.net.cn/jx-callback/globals"
"regexp"
"strings"
"time"
"git.rosy.net.cn/baseapi/utils"
)
@@ -32,7 +33,8 @@ const ( // {"attrId":1200000275,"attrName":"是否有机","valueList":[{"valueId
MtwmSkuAttr200002716 = `[{"attrId":1200000287,"attrName":"特产品种","valueList":[{"valueId":1300003951,"value":"非特产品种"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]`
//200002667，200002713
MtwmSkuAttr200002670 = `[{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000287,"attrName":"特产品种","valueList":[{"valueId":1300003951,"value":"非特产品种"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]`
MtwmSkuAttr200002680 = `[{"attrId":1200000289,"attrName":"品规","valueList":[{"valueId":1300004255,"value":"未区分品规"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]`
//MtwmSkuAttr200002680 = `[{"attrId":1200000289,"attrName":"品规","valueList":[{"valueId":1300004255,"value":"未区分品规"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]`
MtwmSkuAttr200002680 = `[{"attrId":1200004607,"attrName":"水果形态","valueList":[{"valueId":1300017364,"value":"新鲜整果"}]},{"attrId":1200004608,"attrName":"单果重量","valueList":[{"valueId":1300004271,"value":"4kg~4.5kg"}]},{"attrId":1200000202,"attrName":"品种","valueList":[{"valueId":1300000249,"value":"其他"}]},{"attrId":1200000094,"attrName":"产地","valueList":[{"valueId":100000050,"value":"中国"}]},{"attrId":1200000132,"attrName":"国产/进口","valueList":[{"valueId":1300000003,"value":"国产"}]},{"attrId":1200000286,"attrName":"果品品牌","valueList":[{"valueId":1300000249,"value":"其他"}]}]`
)
var (
@@ -177,15 +179,15 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat
params := utils.Struct2MapByJson(updateParams)
params[KeyAppPoiCode] = poiCode
params["category_name"] = catName
time.Sleep(200 * time.Millisecond)
_, err = a.AccessAPI("retailCat/update", false, params)
return err
}
// 删除商品分类
// 当分类下存在子级分类或商品时，不允许直接删除此分类。
func (a *API) RetailCatDelete(poiCode, code, name string) (err error) {
globals.SugarLogger.Debugf("RetailCatDelete======poiCode %s", poiCode)
globals.SugarLogger.Debugf("RetailCatDelete======name %s", name)
func (a *API) RetailCatDelete(poiCode, code, name string, moveProductToUncate int) (err error) {
params := map[string]interface{}{
KeyAppPoiCode: poiCode,
}
@@ -194,10 +196,12 @@ func (a *API) RetailCatDelete(poiCode, code, name string) (err error) {
} else {
params["category_name"] = name
}
_, err = a.AccessAPI("retailCat/delete", false, params)
if err != nil {
globals.SugarLogger.Debugf("RetailCatDelete======err %s", err.Error())
if moveProductToUncate != 0 {
params["move_product_to_uncate"] = 1 // 分类存在商品时将商品转移到未分类当中
}
_, err = a.AccessAPI("retailCat/delete", false, params)
return err
}
@@ -205,11 +209,6 @@ func (a *API) RetailCatList(poiCode string) (retailCatList []*RetailCategoryInfo
result, err := a.AccessAPI("retailCat/list", true, map[string]interface{}{
KeyAppPoiCode: poiCode,
})
if err != nil {
globals.SugarLogger.Debugf("RetailCatList==========err %v", err)
}
globals.SugarLogger.Debugf("result==========err %s", utils.Format4Output(result, false))
if err == nil {
return interface2CatList(result, 1, nil), nil
}
@@ -503,11 +502,10 @@ func (a *API) BatchSetRestockingPrice(trackInfo, appPoiCode string, spuData []*S
globals.SugarLogger.Debugf("BatchSetRestockingPrice params======%s %s %s", v.PurchasePrice, v.AppSpuCode, v.SkuID)
}
}
retVal, err := a.AccessAPI2("/retail/purchase/price/update", false, map[string]interface{}{
_, err := a.AccessAPI2("/retail/purchase/price/update", false, map[string]interface{}{
KeyAppPoiCode: appPoiCode,
"spu_data": spuData,
}, resultKeyMsg, trackInfo)
globals.SugarLogger.Debugf("BatchSetRestockingPrice retVal====%v err===========%v", retVal, err)
return err
}

87
platformapi/mtwmapi/retail_test.go
View File

File diff suppressed because one or more lines are too long

4
platformapi/tiktok_shop/tiktok_api/api_test.go
View File

@@ -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)
}

10
platformapi/tiktok_shop/tiktok_api/logistics_express.go
View File

@@ -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
}

4
platformapi/tiktok_shop/tiktok_api/order.go
View File

@@ -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)

9
platformapi/tiktok_shop/tiktok_api/sku.go
View File

@@ -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
}

2
platformapi/tiktok_shop/tiktok_api/sku_delete_test.go
View File

@@ -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)
}

97
platformapi/tiktok_shop/tiktok_api/sku_test.go
View File

File diff suppressed because one or more lines are too long

48
platformapi/tiktok_shop/tiktok_api/store.go
View File

@@ -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
}

6
platformapi/tiktok_shop/tiktok_api/transport.go
View File

@@ -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
}

3
platformapi/uuptapi/callback.go
View File

@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"net/http"
)
@@ -48,7 +47,6 @@ func (a *API) WaybillCallback(request *http.Request) (*WaybillCallbackParam, *Ca
if err := decoder.Decode(&retVal); err != nil {
return nil, Err2CallbackResponse(errors.New("uu跑腿回调参数解析错误,请检查"))
}
globals.SugarLogger.Debugf("uupt WaybillCallback retVal======%s", utils.Format4Output(retVal, false))
con := retVal != WaybillCallbackParam{}
if con {
return &retVal, Err2CallbackResponse(nil)
@@ -62,7 +60,6 @@ func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *
if err == nil {
sign := a.signParam(utils.URLValues2Map(request.PostForm))
if sign != request.FormValue(signKey) {
globals.SugarLogger.Infof("Signature is not ok, mine:%v, get:%v", sign, request.FormValue(signKey))
return SignatureIsNotOk
}
} else {

2
platformapi/uuptapi/uuptapi.go
View File

@@ -5,7 +5,6 @@ import (
"fmt"
"git.rosy.net.cn/baseapi/platformapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"math/rand"
"net/http"
"sort"
@@ -77,7 +76,6 @@ func (a *API) AccessAPI(baseUrl, actionApi, method string, bizParams map[string]
//}
//完整请求url
fullPath := utils.GenerateGetURL(baseUrl, actionApi, nil)
globals.SugarLogger.Debugf("uupt fullPath======%s", fullPath)
//发送请求
sendUrl := func() *http.Request {
var request *http.Request