From 6945d1d36986fb37c33020f1ee7bdc5b20b47852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 21 Jul 2023 09:25:50 +0800 Subject: [PATCH 1/5] 1 --- platformapi/tao_vegetable/store_sku.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 59ae556c..cb872466 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -15,11 +15,6 @@ import ( func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableResultList, error) { client := ability585.NewAbility585(&a.client) data, _ := client.AlibabaWdkSkuAdd(param, a.token) - if !*data.Result.Success { - //globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false)) - return nil, fmt.Errorf(*data.Result.ErrMsg) - } - var foodList = make([]VegetableResultList, 0, len(*data.Result.Models)) for _, v := range *data.Result.Models { if *v.Success { From 970be5bde3b5ec19c4455348afc18b30f9caf10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 21 Jul 2023 16:29:16 +0800 Subject: [PATCH 2/5] 1 --- platformapi/fnpsapi/fn_test.go | 9 ++++++++- platformapi/fnpsapi/order.go | 10 ++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/platformapi/fnpsapi/fn_test.go b/platformapi/fnpsapi/fn_test.go index 2f1c939d..5e6055d0 100644 --- a/platformapi/fnpsapi/fn_test.go +++ b/platformapi/fnpsapi/fn_test.go @@ -21,7 +21,7 @@ func init() { api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "5375691", "") //token, _ := api.GetAccessToken() - api.accessToken = "c7ed10b7-3ecf-4def-adc1-9f43d5e9480c" + api.accessToken = "0d572b0b-9742-4e2b-9d00-5a6609867dd3" } // 查询单个门店 @@ -198,3 +198,10 @@ func TestCancelOrder(t *testing.T) { err := api.CancelOrder(¶m) // 1100537991119839487 1100536591119839487 globals.SugarLogger.Debug("err:= %s", utils.Format4Output(err, false)) } + +func TestComplaintRider(t *testing.T) { + api = New("6705486294797503379", "c1e6c280-e618-4103-9d0a-673bc54fb22e", "51658", "") + api.accessToken = "0d572b0b-9742-4e2b-9d00-5a6609867dd3" + err := api.ComplaintRider("1100643132821623946", "300000718145112173", 160, "1") + fmt.Println(err) +} diff --git a/platformapi/fnpsapi/order.go b/platformapi/fnpsapi/order.go index d7d31288..495c57d7 100644 --- a/platformapi/fnpsapi/order.go +++ b/platformapi/fnpsapi/order.go @@ -269,17 +269,19 @@ func (a *API) ComplaintOrder(req *ComplaintOrderReq) (err error) { return err } -func (a *API) ComplaintRider(partnerOrderCode string, orderComplaintCode int) (err error) { +func (a *API) ComplaintRider(partnerOrderCode string, orderId string, orderComplaintCode int, resonDes string) (err error) { orderHead := a.MakeFnRequestHead() bytes, err := json.Marshal(map[string]interface{}{ - "partner_order_code": partnerOrderCode, + "order_id": orderId, "order_complaint_code": orderComplaintCode, + "order_complaint_desc": resonDes, + "partner_order_code": partnerOrderCode, }) if err != nil { return err } - orderHead["businessData"] = string(bytes) - _, err = a.AccessAPI(ApiURL, "cancelOrder", RequestPost, orderHead) + orderHead["business_data"] = string(bytes) + _, err = a.AccessAPI(ApiURL, "complaintOrder", RequestPost, orderHead) return err } From 501e93e5a8195439a56c8260a5c1367024ff63d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 21 Jul 2023 18:48:54 +0800 Subject: [PATCH 3/5] 1 --- platformapi/ebaiapi/order.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/ebaiapi/order.go b/platformapi/ebaiapi/order.go index 7cb61cab..f5d202ba 100644 --- a/platformapi/ebaiapi/order.go +++ b/platformapi/ebaiapi/order.go @@ -32,6 +32,7 @@ const ( ) const ( + WaybillStatusEvent = "1" // 一般事件 WaybillStatusNew = "2" // 生成运单 WaybillStatusRequestDelivery = "3" // 请求配送 WaybillStatusWait4Courier = "4" // 等待分配骑士 From 4e2d9813dd8f83ffd787a41cae2631c47a403a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 25 Jul 2023 11:10:29 +0800 Subject: [PATCH 4/5] 1 --- platformapi/tao_vegetable/store_sku_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platformapi/tao_vegetable/store_sku_test.go b/platformapi/tao_vegetable/store_sku_test.go index 0f99abcb..5aeb7bef 100644 --- a/platformapi/tao_vegetable/store_sku_test.go +++ b/platformapi/tao_vegetable/store_sku_test.go @@ -115,11 +115,11 @@ func TestUpdateSku(t *testing.T) { param := &request585.AlibabaWdkSkuUpdateRequest{} updateSkuList := make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) updateSku := domain585.AlibabaWdkSkuUpdateSkuDo{ - OuCode: utils.String2Pointer("JX668594"), - SkuCode: utils.String2Pointer("19930827"), - AvgWeight: utils.String2Pointer("1"), - ItemTypeNew: utils.Int64ToPointer(1), - OnlineSaleFlag: utils.Int64ToPointer(1), + OuCode: utils.String2Pointer("JX667321"), + SkuCode: utils.String2Pointer("26024"), + ShortTitle: utils.String2Pointer("小时达"), + SkuPrice: utils.String2Pointer("80"), + CleanSkuMemberPrice: utils.Int64ToPointer(1), } updateSkuList = append(updateSkuList, updateSku) param.ParamList = &updateSkuList From 59c137b98b59f04ab90c760f9d8275edeb5395c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 26 Jul 2023 15:16:32 +0800 Subject: [PATCH 5/5] 1 --- platformapi/tao_vegetable/order_test.go | 40 ++++++++++--------- .../tiktok_shop/tiktok_api/afs_test.go | 2 +- .../tiktok_shop/tiktok_api/sku_test.go | 3 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index 45d10b9f..ae3e3c08 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -21,8 +21,8 @@ func TestName(t *testing.T) { } func TestGetOrderDetail(t *testing.T) { requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{ - StoreId: utils.String2Pointer("JX668594"), - BizOrderId: utils.Int64ToPointer(5000902065494700922), + StoreId: utils.String2Pointer("JX102751"), + BizOrderId: utils.Int64ToPointer(5000908068888360754), }} data, err := apiTao.QueryOrderDetail(requestParam) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) @@ -46,12 +46,13 @@ func TestQueryAfsOrderDetail(t *testing.T) { param := &request591.AlibabaWdkOrderRefundGetRequest{ OrderFrom: utils.Int64ToPointer(31), ShopId: nil, - StoreId: utils.String2Pointer("JX668594"), - RefundIds: &[]int64{1314241374}, + StoreId: utils.String2Pointer("JX102751"), + RefundIds: &[]int64{1315405271}, } data, err := apiTao.QueryAfsOrderDetail(param) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false)) + } // 接单 @@ -87,7 +88,7 @@ func TestDeliveryFinishREJECTED(t *testing.T) { } func TestGetTransactionOrderList(t *testing.T) { - queryData := time.Now().AddDate(0, 0, 6) + queryData := time.Now().AddDate(0, 0, 0) create := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 0, 0, 0, 0, queryData.Location()) end := time.Date(queryData.Year(), queryData.Month(), queryData.Day(), 23, 59, 59, 59, queryData.Location()) createTime := util.LocalTime(create) @@ -96,12 +97,12 @@ func TestGetTransactionOrderList(t *testing.T) { var PageSize int64 = 20 param := &request591.AlibabaWdkOrderListRequest{ BatchQueryRequest: &domain591.AlibabaWdkOrderListBatchQueryRequest{ - StoreIds: &[]string{"JX668594"}, + StoreIds: &[]string{"JX102751"}, StartTime: &createTime, EndTime: &endTime, OrderFrom: utils.Int64ToPointer(ChannelCome), ShopId: nil, - StoreId: utils.String2Pointer("JX668594"), + StoreId: utils.String2Pointer("JX102751"), BizType: nil, }, } @@ -113,20 +114,21 @@ func TestGetTransactionOrderList(t *testing.T) { globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false)) return } + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) // 取消订单 - for _, v := range *data.Orders { - err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{ - WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ - StoreId: utils.String2Pointer("JX668594"), - BizOrderId: utils.Int64ToPointer(*v.BizOrderId), - Status: utils.String2Pointer("REJECTED"), - }, - }) - if err != nil { - fmt.Println(err) - } - } + //for _, v := range *data.Orders { + // err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{ + // WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ + // StoreId: utils.String2Pointer("JX668594"), + // BizOrderId: utils.Int64ToPointer(*v.BizOrderId), + // Status: utils.String2Pointer("REJECTED"), + // }, + // }) + // if err != nil { + // fmt.Println(err) + // } + //} } func TestPickUp(t *testing.T) { diff --git a/platformapi/tiktok_shop/tiktok_api/afs_test.go b/platformapi/tiktok_shop/tiktok_api/afs_test.go index 86dcd13a..daf688d3 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":"ec2e3053-73dc-4e39-87ba-db081bbb55df","expires_in":1689492851,"scope":"SCOPE","shop_id":57939570,"shop_name":"京西菜市速食","refresh_token":"f7d2e88c-28c6-46bd-b63a-3d3c49ce0c76","authority_id":""}` +var token = `{"access_token":"6045a7f5-622e-4126-b555-46a4da29e80a","expires_in":1690341662,"scope":"SCOPE","shop_id":68023619,"shop_name":"京西到家","refresh_token":"6092b5c5-af6e-4481-92e1-545632c58247","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 d748da63..cf99a62d 100644 --- a/platformapi/tiktok_shop/tiktok_api/sku_test.go +++ b/platformapi/tiktok_shop/tiktok_api/sku_test.go @@ -396,9 +396,10 @@ func TestDeleteSkuAndUploadSkuFengJinBiXu22332(t *testing.T) { for i := 1; i < 100; i++ { result, err := a.GetSkuDetailList(&product_listV2_request.ProductListV2Param{ Status: 0, - CheckStatus: 4, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 + CheckStatus: 3, // 1-未提交；2-待审核；3-审核通过；4-审核未通过；5-封禁；7-审核通过待上架 Page: int64(i), Size: 100, + StoreId: 81521327, }) if err != nil { globals.SugarLogger.Debugf("=index := %d ,err := %s", i, utils.Format4Output(err, false))