From 6a74908f7247db07d5662aa087f1daa2eb646303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 15:10:12 +0800 Subject: [PATCH 1/3] 1 --- platformapi/mtwmapi/mtwmapi_test.go | 6 +++--- platformapi/uinapp/uin_app_test.go | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 3fdd938b..173e4b63 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_n4TwqCntWWuvQwAawzxC0w") //token_n4TwqCntWWuvQwAawzxC0w + api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_n4TwqCntWWuvQwAawzxC0w") //token_n4TwqCntWWuvQwAawzxC0w 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("17395411") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg + result, err := api.GetAccessToken2("17465429") //refresh_token_pLG7Jw7g9mu7oOzNSuJIUg if err != nil { t.Fatal(err) } diff --git a/platformapi/uinapp/uin_app_test.go b/platformapi/uinapp/uin_app_test.go index 100755e3..84bd4ca5 100644 --- a/platformapi/uinapp/uin_app_test.go +++ b/platformapi/uinapp/uin_app_test.go @@ -2,8 +2,10 @@ package uinapp import ( "fmt" + "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" "testing" + "time" ) var ( @@ -59,3 +61,8 @@ func TestCidSend(t *testing.T) { }) fmt.Println(err) } + +func TestTime(t *testing.T) { + timestamp := utils.Int64ToStr(time.Now().UnixNano() / 1e6) + fmt.Println(timestamp) +} From 301be326848973d79b504d6526a08071e5028a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 18:17:40 +0800 Subject: [PATCH 2/3] 1 --- .../tiktok_shop/tiktok_api/afs_test.go | 2 +- .../tiktok_shop/tiktok_api/sku_test.go | 21 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index 135d168b..fb0d6331 100644 --- a/platformapi/tiktok_shop/tiktok_api/afs_test.go +++ b/platformapi/tiktok_shop/tiktok_api/afs_test.go @@ -18,7 +18,7 @@ import ( // "authority_id": "" //}` -var token = `{"access_token":"c2c6e258-847d-4e8f-a695-b20488a5a667","expires_in":1682270239,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"ebf0e9f1-b200-47c2-a2bb-bafefbdaed47","authority_id":""}` +var token = `{"access_token":"71896365-cec7-4982-a686-0d8f3044cc1e","expires_in":1682872676,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"76d410d2-e869-4ddc-b8ad-0ae652114e13","authority_id":""}` //var token = `{"access_token":"e3173e9f-266f-4d87-88e7-e7cd837bc9d9","expires_in":1672882632,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"5070aae2-493f-46bd-b5d6-6ea0cd64729f","authority_id":""}` diff --git a/platformapi/tiktok_shop/tiktok_api/sku_test.go b/platformapi/tiktok_shop/tiktok_api/sku_test.go index 379f87ed..c3dcfd40 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -140,23 +140,7 @@ func TestBatchDecrypt(t *testing.T) { //} var c = []int64{ - 87893329, - 87542533, - 86486240, - 86454312, - 85672244, - 85672146, - 85672027, - 85671854, - 85671727, - 85671454, - 85671173, - 85670943, - 84938439, - 84936029, - 83727966, - 81521327, - 80790189} + 64208920} //668851, //668841, @@ -280,10 +264,11 @@ func TestDeleteSkuAndUploadSku7(t *testing.T) { for _, v := range c { for i := 1; i < 100; i++ { result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{ - CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 + CheckStatus: 1, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 Page: int64(i), Size: 100, StoreId: v, + Status: 1, }) if err != nil { globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false)) From 28f172133be8ace7924acf6d7b97339926328422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 15:24:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96,?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=9C=8D=E5=8A=A1=E5=95=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/mtwmapi/bill_list.go | 20 +++++++++++++++----- platformapi/mtwmapi/bill_list_test.go | 10 ++-------- platformapi/mtwmapi/mtwmapi_test.go | 4 ++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/platformapi/mtwmapi/bill_list.go b/platformapi/mtwmapi/bill_list.go index 139be7f3..bf9e52d3 100644 --- a/platformapi/mtwmapi/bill_list.go +++ b/platformapi/mtwmapi/bill_list.go @@ -10,6 +10,8 @@ const ( BillChargeTypeTimingFee = 10 // 定时宝,保险费 ) +//#region 获取门店订单的结算信息 bill/list + type Bill struct { AppPoiCode string `json:"app_poi_code"` // APP方门店id，传商家中台系统里门店的编码。如商家在操作绑定门店至开放平台应用中时，未绑定三方门店id信息，则默认APP方门店id与美团门店id相同。 StartDate int64 `json:"start_date"` // 秒级时间戳 @@ -31,18 +33,24 @@ type Bill struct { 3）想要实现的效果； 4）预计开发周期和上线时间； 5）商家公司授权开通日账单接口的证明。（点击下载授权证明模板，授权证明以附件形式提供。）*/ -func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, error) { +func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, int64, error) { + // 门店订单结算信息(配送费和定时保险费) orderSettle := make(map[string]*SettleOrderList, 0) - + // 门店订单的结算id + var settleID int64 = 0 for { result, err := a.AccessAPI3("bill/list", true, utils.Struct2Map(param, "", false)) if err != nil { - return nil, err + return nil, 0, err } var data *StoreBillListRes if err := utils.Map2StructByJson(result, &data, false); err != nil { - return nil, err + return nil, 0, err + } + + if len(data.Data) > 0 && param.Offset == 0 { + settleID = utils.Str2Int64(data.Data[0].SettleSettingId) } for _, v := range data.Data { @@ -70,7 +78,7 @@ func (a *API) GetStoreBillList(param *Bill) (map[string]*SettleOrderList, error) } } - return orderSettle, nil + return orderSettle, settleID, nil } // StoreBillListReq 门店结算查询条件 @@ -184,3 +192,5 @@ type SettleOrderList struct { DeliveryFee int64 `json:"delivery_fee"` // 配送费 PlatformSettlement int64 `json:"platform_settlement"` // 平台结算金额 } + +//#endregion diff --git a/platformapi/mtwmapi/bill_list_test.go b/platformapi/mtwmapi/bill_list_test.go index 3818cb30..e1dc7f11 100644 --- a/platformapi/mtwmapi/bill_list_test.go +++ b/platformapi/mtwmapi/bill_list_test.go @@ -1,7 +1,6 @@ package mtwmapi import ( - "fmt" "git.rosy.net.cn/jx-callback/globals" "testing" "time" @@ -19,19 +18,14 @@ func TestBillList(t *testing.T) { Limit: 200, } - data, err := api.GetStoreBillList(param) + data, settleId, err := api.GetStoreBillList(param) if err != nil { globals.SugarLogger.Debugf("err := %v", err) return } + globals.SugarLogger.Debugf("settleId := %d", settleId) for _, v := range data { globals.SugarLogger.Debugf("OrderId : %s , TimingFee : %d , DeliveryFee : %d , PlatformSettlement : %d ", v.OrderId, v.TimingFee, v.DeliveryFee, v.PlatformSettlement) } } - -func TestA1(t *testing.T) { - a := -20 - fmt.Println(a * -1) - -} diff --git a/platformapi/mtwmapi/mtwmapi_test.go b/platformapi/mtwmapi/mtwmapi_test.go index 173e4b63..50d9ada7 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_n4TwqCntWWuvQwAawzxC0w") //token_n4TwqCntWWuvQwAawzxC0w + //api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_n4TwqCntWWuvQwAawzxC0w") //token_n4TwqCntWWuvQwAawzxC0w cookieStr := ` acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1; `