diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 7fad5bd4..3b0fee2d 100644 --- a/platformapi/mtwmapi/mtwmapi_test.go +++ b/platformapi/mtwmapi/mtwmapi_test.go @@ -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) } diff --git a/platformapi/mtwmapi/order_test.go b/platformapi/mtwmapi/order_test.go index 178fb325..2fe114d9 100644 --- a/platformapi/mtwmapi/order_test.go +++ b/platformapi/mtwmapi/order_test.go @@ -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) diff --git a/platformapi/mtwmapi/poi_test.go b/platformapi/mtwmapi/poi_test.go index 5c358c4e..c6398ce3 100644 --- a/platformapi/mtwmapi/poi_test.go +++ b/platformapi/mtwmapi/poi_test.go @@ -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) diff --git a/platformapi/mtwmapi/retail.go b/platformapi/mtwmapi/retail.go index 73b2b9da..635b6a36 100644 --- a/platformapi/mtwmapi/retail.go +++ b/platformapi/mtwmapi/retail.go @@ -1,6 +1,7 @@ package mtwmapi import ( + "errors" "git.rosy.net.cn/jx-callback/globals" "regexp" "strings" @@ -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,10 +179,26 @@ func (a *API) RetailCatUpdate(poiCode, catName string, updateParams *Param4Updat params := utils.Struct2MapByJson(updateParams) params[KeyAppPoiCode] = poiCode params["category_name"] = catName - _, err = a.AccessAPI("retailCat/update", false, params) - return err + + categoryChannel <- params + for { + select { + case <-categoryChannel: + if _, err := a.AccessAPI("retailCat/update", false, params); err != nil { + errList = append(errList, err.Error()) + } + default: + return errors.New(strings.Join(errList, ",")) + } + } + + // _, err = a.AccessAPI("retailCat/update", false, params) + //return err } +var categoryChannel = make(chan map[string]interface{}, 100) +var errList = make([]string, 0, 0) + // 删除商品分类 // 当分类下存在子级分类或商品时，不允许直接删除此分类。 func (a *API) RetailCatDelete(poiCode, code, name string) (err error) { diff --git a/platformapi/mtwmapi/retail_test.go b/platformapi/mtwmapi/retail_test.go index 60faa73a..65d6c459 100644 --- a/platformapi/mtwmapi/retail_test.go +++ b/platformapi/mtwmapi/retail_test.go @@ -10,25 +10,36 @@ import ( "git.rosy.net.cn/baseapi/utils" ) +// 测试添加分类 +func TestRetailCatUpdate(t *testing.T) { + err := api.RetailCatUpdate("12663480", "测试2底料", &Param4UpdateCat{ + CategoryNameOrigin: "", + CategoryCodeOrigin: "", + CategoryCode: "45", + Sequence: 0, + }) + if err != nil { + t.Fatal(err) + } +} + +// 测试获取门店分类列表 func TestRetailCatList(t *testing.T) { - result, err := api.RetailCatList("8061767") + result, err := api.RetailCatList("12663480") if err != nil { t.Fatal(err) } t.Log(utils.Format4Output(result, false)) } -func TestRetailCatUpdate(t *testing.T) { - err := api.RetailCatUpdate("16690980", "咸菜罐头", &Param4UpdateCat{ - CategoryNameOrigin: "咸菜罐头", - CategoryCodeOrigin: "", - CategoryCode: "1", - Sequence: 3, - }) +// 测试删除门店分类列表 +func TestDeleteCat(t *testing.T) { + err := api.RetailCatDelete("12663480", "", "火锅底料") if err != nil { t.Fatal(err) } } + func TestRetailCatDelete(t *testing.T) { //var err error errList := errlist.New() diff --git a/platformapi/tiktok_shop/tiktok_api/api_test.go b/platformapi/tiktok_shop/tiktok_api/api_test.go index edd03e57..03fba8d6 100644 --- a/platformapi/tiktok_shop/tiktok_api/api_test.go +++ b/platformapi/tiktok_shop/tiktok_api/api_test.go @@ -21,7 +21,7 @@ func TestApi(t *testing.T) { } func TestQueryOrderDetail(t *testing.T) { - data, err := a.GetTiktokOrderDetail("5012575500183489614") + data, err := a.GetTiktokOrderDetail("5038446046747543348") globals.SugarLogger.Debugf("=====%s", utils.Format4Output(data, false)) globals.SugarLogger.Debugf("=====%s", err) }