From 7b4929bd021bc256dba3d0572cfa45de1dcb2fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 29 Jul 2023 19:42:16 +0800 Subject: [PATCH] 1 --- platformapi/jdapi/jdapi_test.go | 6 +- platformapi/jdapi/order.go | 15 ++- platformapi/jdapi/order_test.go | 2 +- platformapi/tao_vegetable/order_test.go | 4 +- .../sdk/ability3156/Ability3156.go | 1 - platformapi/tao_vegetable/store_test.go | 123 ++++++++++++++++++ 6 files changed, 137 insertions(+), 14 deletions(-) diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 42fa10ff..6e49e965 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -28,10 +28,10 @@ func init() { // api = New("73e2e9f6-b21e-4dcd-8c92-71e4e100b07e", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4") // 天天果园 //api = New("c45e6510-00ba-4be2-977e-bcb9c9792cc7", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") - // 京东果园 - //api = New("b1138139-9610-4b80-9a63-a63da4773885", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") + // 京东果园 320406 + api = New("c454ef86-2213-4860-9a31-f2ef7e883386", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4") // 果切 - api = New("3ef42248-1247-4efa-8624-43cd3a3b97ae", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") + //api = New("3ef42248-1247-4efa-8624-43cd3a3b97ae", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26") // 京东超市 381564 // api = New("f99d25b8-33a6-4251-a97c-5e24b80b0005", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da") diff --git a/platformapi/jdapi/order.go b/platformapi/jdapi/order.go index 080c0361..3a462c68 100644 --- a/platformapi/jdapi/order.go +++ b/platformapi/jdapi/order.go @@ -452,14 +452,15 @@ func (a *API) OrderAcceptOperate(orderId string, isAgreed bool, userName string) "isAgreed": utils.Bool2String(isAgreed), "operator": utils.GetAPIOperator(userName), } + + // 接单 _, err := a.AccessAPINoPage("ocs/orderAcceptOperate", jdParams, nil, nil, orderOperationResultParser) - if err != nil { - printParam := map[string]interface{}{ - "orderId": utils.Str2Int64(orderId), - } - result, err := a.AccessAPINoPage("bm/open/api/order/printOrder", printParam, nil, nil, nil) - globals.SugarLogger.Debugf("============result := %s", utils.Format4Output(result, false)) - globals.SugarLogger.Debugf("============result := %s", utils.Format4Output(err, false)) + // 打印 + printResult, err2 := a.AccessAPINoPage("bm/open/api/order/printOrder", map[string]interface{}{ + "orderId": utils.Str2Int64(orderId), + }, nil, nil, nil) + if err2 != nil { + globals.SugarLogger.Debugf("打印订单错误: %s,%v", utils.Format4Output(printResult, false), err2) } return err } diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 9c1ac3fb..a08dba63 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -54,7 +54,7 @@ func TestOrderQuery(t *testing.T) { } func TestOrderAcceptOperate(t *testing.T) { - err := api.OrderAcceptOperate("813344594000041", true, "") + err := api.OrderAcceptOperate("2318125162000391", true, "") if err != nil { t.Fatal(err.Error()) } diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index 3fde13e5..dc0985b3 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -60,8 +60,8 @@ func TestQueryAfsOrderDetail(t *testing.T) { func TestDeliveryFinishACCEPTED(t *testing.T) { param := &request591.AlibabaAelophyOrderWorkCallbackRequest{} param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ - StoreId: utils.String2Pointer("JX668594"), - BizOrderId: utils.Int64ToPointer(5000900574962430922), + StoreId: utils.String2Pointer("JX667321"), + BizOrderId: utils.Int64ToPointer(5000909465906250087), Status: utils.String2Pointer("SIGN"), StatusRemark: nil, DelivererName: utils.String2Pointer("张廷"), diff --git a/platformapi/tao_vegetable/sdk/ability3156/Ability3156.go b/platformapi/tao_vegetable/sdk/ability3156/Ability3156.go index 7596f0de..5b51b44a 100644 --- a/platformapi/tao_vegetable/sdk/ability3156/Ability3156.go +++ b/platformapi/tao_vegetable/sdk/ability3156/Ability3156.go @@ -116,7 +116,6 @@ func (ability *Ability3156) AlibabaAelophyShopUpdatestatus(req *request2.Alibaba if respStruct.Body == "" || len(respStruct.Body) == 0 { respStruct.Body = jsonStr } - globals.SugarLogger.Debugf("ShopUpdatestatus respStruct=%s", utils.Format4Output(&respStruct, false)) return &respStruct, err } diff --git a/platformapi/tao_vegetable/store_test.go b/platformapi/tao_vegetable/store_test.go index d2c17e21..5edd6205 100644 --- a/platformapi/tao_vegetable/store_test.go +++ b/platformapi/tao_vegetable/store_test.go @@ -122,3 +122,126 @@ func TestShopUpdateRange(t *testing.T) { err := apiTao.ShopUpdateRange("JX668998", points) fmt.Println(err) } + +func TestUpdateStoreTest(t *testing.T) { + aa := []string{ + "JX668691", + "JX668282", + "JX667447", + "JX667354", + "JX667319", + "JX667316", + "JX669158", + "JX667269", + "JX667267", + "JX667260", + "JX667132", + "JX667030", + "JX666965", + "JX666714", + "JX666708", + "JX666705", + "JX103437", + "JX103349", + "JX103123", + "JX103121", + "JX103106", + "JX103038", + "JX103028", + "JX103019", + "JX102831", + "JX102751", + "JX102683", + "JX102542", + "JX102514", + "JX102382", + "JX102182", + "JX102178", + "JX102173", + "JX102098", + "JX102094", + "JX102080", + "JX102072", + "JX102069", + "JX101870", + "JX101869", + "JX101868", + "JX101867", + "JX101866", + "JX101865", + "JX100956", + "JX100930", + "JX100871", + "JX100786", + "JX100746", + "JX100744", + "JX100726", + "JX100705", + "JX100400", + "JX100111", + "JX100108", + "JX100104", + "JX100103", + "JX100102", + "JX100100", + "JX100097", + "JX100096", + "JX100095", + "JX100093", + "JX100089", + "JX100087", + "JX100086", + "JX100085", + "JX100082", + "JX100079", + "JX100078", + "JX668673", + "JX667321", + "JX667268", + "JX667094", + //669158, + //667321, + //667094, + //668906, + //668886, + //668880, + //668751, + //668701, + //668569, + //668567, + //668506, + //667231, + //667068, + //103191, + //103051, + //103050, + //103037, + //103018, + //102951, + //102924, + //102920, + //102908, + //102561, + //100946, + //100720, + //100325, + //100324, + //100296, + //100290, + } + for _, v := range aa { + //err := apiTao.ShopUpdateStatus(fmt.Sprintf("jx%d", v), -1) + //fmt.Println(err) + err := apiTao.ShopUpdateStatus(v, -1) + if err != nil { + fmt.Println(err) + } + } +} + +func TestDelete(t *testing.T) { + err := apiTao.ShopUpdateStatus("JX668594", -1) + if err != nil { + fmt.Println(err) + } +}