From 32a2c0498b4f18824f192d31c02bfb3ba62d51bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Tue, 9 Mar 2021 18:03:31 +0800 Subject: [PATCH] aa --- platformapi/ebaiapi/activity.go | 31 ++++++++++++++++++++++++ platformapi/ebaiapi/activity_test.go | 7 ++++++ platformapi/ebaiapi/shop_test.go | 2 +- platformapi/jdapi/jdapi_test.go | 4 +-- platformapi/jdshopapi/store_page_test.go | 3 +-- platformapi/mtwmapi/act.go | 7 ++++++ platformapi/mtwmapi/act_test.go | 2 +- 7 files changed, 50 insertions(+), 6 deletions(-) diff --git a/platformapi/ebaiapi/activity.go b/platformapi/ebaiapi/activity.go index b56e00eb..35b3d9b4 100644 --- a/platformapi/ebaiapi/activity.go +++ b/platformapi/ebaiapi/activity.go @@ -26,6 +26,26 @@ const ( MaxActivityDescLength = 15 // 优惠描述限15个字符 ) +var ( + ActivityTypeList = []string{ + "2", //:单品特价, + "8", //:品类满减, + "9", //:全店满减, + "10", //:新用户立减, + "11", //:运费满减, + "41", //:第N件特价, + "32", //:N选1商品活动, + "40", //:买N赠M商品活动, + "33", //:下单返券活动, + "34", //:M件X元或折, + "35", //:N元购, + "36", //:全店满减券(即商家代金券), + "37", //:商品满减券, + "38", //:跨seller商品满减券, + "39", //:跨seller运费券 + } +) + type ActivityRule struct { Accords int `json:"accords"` // 订单达到的金额，正整数，单位元。 Sale int `json:"sale"` // 每单减价额度，正整数，单位元。 @@ -247,3 +267,14 @@ func (a *API) ActivitySkuUpdateBatch(activityID int64, actSkuInfoList []*Activit } return nil, err } + +// 多渠道查询获取参与的活动IdList +func (a *API) ActMultiChannelQueryIDs(shopID string, baiduShopID int64, actType string) (err error) { + params := a.genShopIDParams(shopID, baiduShopID, 0) + params["query_activity_type"] = actType + _, err = a.AccessAPI("act.multi.channel.queryids", params) + if err == nil { + return nil + } + return err +} diff --git a/platformapi/ebaiapi/activity_test.go b/platformapi/ebaiapi/activity_test.go index e147ae79..6ef6247c 100644 --- a/platformapi/ebaiapi/activity_test.go +++ b/platformapi/ebaiapi/activity_test.go @@ -93,3 +93,10 @@ func TestActivitySkuList(t *testing.T) { t.Log(utils.Format4Output(activityInfo, false)) } } + +func TestActMultiChannelQueryIDs(t *testing.T) { + err := api.ActMultiChannelQueryIDs("", 200000066556, "2") + if err != nil { + t.Fatal(err) + } +} diff --git a/platformapi/ebaiapi/shop_test.go b/platformapi/ebaiapi/shop_test.go index 1833d9a9..4edf9aa1 100644 --- a/platformapi/ebaiapi/shop_test.go +++ b/platformapi/ebaiapi/shop_test.go @@ -243,7 +243,7 @@ func TestShopAptitudeUpload(t *testing.T) { } func TestShopDeliveryinfoGet(t *testing.T) { - result, err := api.ShopDeliveryinfoGet("", 32267315064) + result, err := api.ShopDeliveryinfoGet("", 100000115429) if err != nil { t.Fatal(err) } diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index d979db61..d0298d33 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -33,8 +33,8 @@ func init() { // const cookieValue = "OPJQMA7B3FTKCAUGO7FHCH5NMBGAWGGXYRNLEHYYZNGNPNIBCAM4IOEPG3NT3RIA44G5C3535Q5LGG4F4SR4AZVLGYKYTKFJJKEAOXENVBL5VXNILRP3GLNVVWA26XZ3VGSYOHA72RICMVZS3G53DTEH3KKMSODEAJKHHXYAH3LVYHN7XCJDFDBTM7ELR5DAISLMYBDKZCAW7ME3IU6YX3SOLHZ7IXBXZ2XSFROMMSKNOYMLDABEV4JA57RIMIX22SNOBCLIFKREPFRN3RZVCFCVTSG7GXALZQUVXLWNYG35TDRA7JURR7VR3YVIP66T6G3SOARECZTEQ27GXNN5VHKRYKPJS72CSISRO5Y" // api.SetJdCookie(cookieValue) // api.SetCookie("user", "VCQUVHVJI4ELNGFZOYMCDYDUSHEJMPXZRZXSNBRB4MVBNENP72REAAZR3R4SGDJ5ZI4FLYLLN5EGBBMTFCWHZVESIWBNLKZPLHWD6UIBTPXOF5IXM6AVA3V6TUNZD5UJS43AROJ2IRPZWEN5AGZYBUEGD3MSKKBKBSRP3DSEQXLITYNBLFZCHXCA7L4KGOSJRMM7R5IQP7QGLGRQB27AOE4YMLRJ3UPTZADPWJOYB3UZ7UZHLBVZRREEX647O3WQUU4BYXUOFZPIPRR77W3PQV543E") - // api.SetCookieWithStr(` - // lsp-store1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4KZATULABNVRXOZXXMGM2SFC7FJV53SUCWW5V6HZO2SBJL5ARX3RKLIEBWPKUX6G67ZV4WUL77J5SQRLBI7ETJN7WKM7KXTGZLDDVQK6JOU24WJL4PVF3PPYDNTOLLXDABUFAZSE6C6CNOMI6L2TAK43JJIJQRQAQUQSU537ZFLVPGBYFDJYY; o2o-pms1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4L6QADCODEQ7HPAGBSIFCQME56IJVNLQP576S22FJ2S6JICBWXDINE7MCIXTUTTBSTPXTH4ZCQQ26HEPMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; josl-privilege1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4JFIVGVMNFIX4EJXL7JPIAY3KHKJVNLQP576S22FJ2S6JICBWXDIM7MUWUE74AUQTVCMMKQE4JG7Z6V3MJHBMCW7DVNX7IVZ2SO6XHKGFHBZ65VKNEBUUCNECJFH6DWBEJF2TLSZFPR6UXN57ANWNZNO4MAGQUDGITYLYJVZRDZPKMBLTNFFB5BCNIBJBWT3K6PVKOCSAJXJPUY; o2o-stock1.jddj.com=FFLJJGBAWKPSZM7MNBCXJ2PTYFVB6FMPUQYSINJLH5HINHNYC22O3IZPU2644VM3AF245ANGSYECBMCITLLRA6QZFCZY3455CLYLYJ3D5EFZ5623HGYBU5Q63KOLKGSK6HD6E3RXWS2SL7G2F4CPWB4W4JLXDMYTRAOI5OWDP5ODT42ZAK7ZVNLQP576S22FJ2S6JICBWXDINLIVVFV3NTWL42UL4YPQWX6AVREPMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; store_deviceid=89a38e81dfbb776fa5f866f74ed437a3; store_session=%231615183107759; jdO2OOpenPortalSessionId=381A8AAF4B93511233C7D242D49DF305.s1; JSESSIONID=462D7A491FA248C2E6C89C2472FF46B8.s1`) + api.SetCookieWithStr(` + lsp-store1.jddj.com=HV2JJVZZQ6GR2IFIXNHJQ3BYHOBPYDTUNNOHXCB6VRVUN5AXDNZO3IZPU2644VM3AF245ANGSYECAFHE2UHA24SEHUKWICOUKR6Y2I7FH6WZLLU5AUEB6WKRZRXDQOBFGP2GJTHFOFCJKXMD53HMJOB27P66RIDPAYXG3SW3ETE24CXEBBXOQUL64DZ2IXTFHHPQMQJI7AQQ7C4T2AHH3BRMPFB6MLBRRIMFX2BLBI7ETJN7WKM7KXTGZLDDVQK6JOU24WJL4PVF3PPYDNTOLLXDABUFAZSE6C6CNOMI6L2TAK43JJIJQRQAQUQSU537ZFLVPGBYFDJYY; josl-privilege1.jddj.com=HV2JJVZZQ6GR2IFIXNHJQ3BYHOBPYDTUNNOHXCB6VRVUN5AXDNZO3IZPU2644VM3AF245ANGSYECAFHE2UHA24SEHUKWICOUKR6Y2I7FH6WZLLU5AUEB6WKRZRXDQOBFGP2GJTHFOFCJKXMD53HMJOB27M4SOMJLKNYFFFFTUF5P4QS236I6D3HP36UWFIO6CIPJOTBVNOAOY4FI3JYA3ZAZIZ26MPENH7FCZTN3MJHBMCW7DVNX7IVZ2SO6XHKGNIGHVIWTECERMEGUTJT3I7IEGVF2TLSZFPR6UXN57ANWNZNO4MAGQUDGITYLYJVZRDZPKMBLTNFFB5BCNIBJBWT3K6PVKOCSAJXJPUY; o2o-stock1.jddj.com=HV2JJVZZQ6GR2IFIXNHJQ3BYHOBPYDTUNNOHXCB6VRVUN5AXDNZO3IZPU2644VM3AF245ANGSYECAFHE2UHA24SEHUKWICOUKR6Y2I7FH6WZLLU5AUEB6WKRZRXDQOBFGP2GJTHFOFCJKXMD53HMJOB27PIARY34I25TBOK2IYW2F6EJ3WS6D3HP36UWFIO6CIPJOTBVNOAOYLT5MMMPGDWB22GHTB2BD3TJIE4PMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; o2o-pms1.jddj.com=HV2JJVZZQ6GR2IFIXNHJQ3BYHOBPYDTUNNOHXCB6VRVUN5AXDNZO3IZPU2644VM3AF245ANGSYECAFHE2UHA24SEHUKWICOUKR6Y2I7FH6WZLLU5AUEB6WKRZRXDQOBFGP2GJTHFOFCJKXMD53HMJOB27OCJ6Q6AC3TQET62Z476QQI4QNB6D3HP36UWFIO6CIPJOTBVNOAOZNHKRY423STTEFH7HYGJVNJG6NEPMG6IKZMBVLP327PEE3OQRFBS3CT2IVMA3GEVFVZYDHM4R25SUY; UM_distinctid=17815ffb82137d-031b594e0e0c26-43734711-15f900-17815ffb822609; jdO2OOpenPortalSessionId=9659CA06C76DB319167D311362118A3F.s1; JSESSIONID=1B3DBA2E032A131FA156481A9FA0CA41.s1`) } func TestTest(t *testing.T) { diff --git a/platformapi/jdshopapi/store_page_test.go b/platformapi/jdshopapi/store_page_test.go index e9261f0c..1c728f09 100644 --- a/platformapi/jdshopapi/store_page_test.go +++ b/platformapi/jdshopapi/store_page_test.go @@ -9,7 +9,6 @@ import ( "math" "sort" "testing" - "time" "git.rosy.net.cn/baseapi/utils" ) @@ -235,7 +234,7 @@ func TestUpdateDeliveryPromise(t *testing.T) { } func TestUploadImageNew(t *testing.T) { - fmt.Println(time.Now().YearDay()) + fmt.Println(int(utils.Str2Time("2021-03-09 23:59:59").Sub(utils.Str2Time("2021-03-07 00:00:00")).Hours()) / 24) } //给定一个包含正整数、加(+)、减(-)、乘(*)、除(/)的算数表达式(括号除外)，计算其结果。 diff --git a/platformapi/mtwmapi/act.go b/platformapi/mtwmapi/act.go index b980408a..e64ba6bb 100644 --- a/platformapi/mtwmapi/act.go +++ b/platformapi/mtwmapi/act.go @@ -45,6 +45,13 @@ const ( SettingTypeAsPrice = 1 // 按折扣价格开展活动s ) +var ( + ActTypeList = []int{ + 1, //-门店商品类+集合类活动， + 2, //-劵类（支持返回的券活动：商家券/活动商家券/商品券/活动商品券/配送券/活动配送券/商品配送券/活动商品配送券） + } +) + type FullDiscountActInfo struct { ActIDs string `json:"act_ids"` ActName string `json:"act_name"` diff --git a/platformapi/mtwmapi/act_test.go b/platformapi/mtwmapi/act_test.go index 17dea3e0..b8717a69 100644 --- a/platformapi/mtwmapi/act_test.go +++ b/platformapi/mtwmapi/act_test.go @@ -114,7 +114,7 @@ func TestParseErr4RetailDiscountDelete(t *testing.T) { } func TestGetByAppPoiCodeAndType(t *testing.T) { - result, err := api.GetByAppPoiCodeAndType("9375120", 1, 1) + result, err := api.GetByAppPoiCodeAndType("10305601", 1, 1) if err != nil { t.Fatal(err) }