From 2a66d5ce00cdcde69233c74db615c0c309bb3879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Jun 2023 15:51:08 +0800 Subject: [PATCH 01/12] 1 --- platformapi/tao_vegetable/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 7f0e137c..98d39cc4 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -20,7 +20,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR client := ability585.NewAbility585(&a.client) data, _ := client.AlibabaWdkSkuAdd(param, a.token) - + globals.SugarLogger.Debugf("AddStoreSku ============= %s", utils.Format4Output(data, false)) 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) From 8042b7514efae8abd1e2b594cf6df36b8a92af09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Jun 2023 16:01:02 +0800 Subject: [PATCH 02/12] 1 --- platformapi/tao_vegetable/store_sku.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 98d39cc4..0954b4ae 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -28,11 +28,19 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR var foodList = make([]VegetableResultList, 0, len(*data.Result.Models)) for _, v := range *data.Result.Models { - foodList = append(foodList, VegetableResultList{ - ProductID: *v.ProductId, - SkuID: *v.Model, - ErrMsg: *v.ErrMsg, - }) + if *v.Success { + foodList = append(foodList, VegetableResultList{ + ProductID: *v.ProductId, + SkuID: *v.Model, + }) + } else { + foodList = append(foodList, VegetableResultList{ + ProductID: "", + SkuID: *v.Model, + ErrMsg: *v.ErrMsg, + }) + } + } return &foodList, nil From 5c096fd7d0dd7c89095362ab2905934918fe4f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Jun 2023 18:01:11 +0800 Subject: [PATCH 03/12] 1 --- platformapi/tao_vegetable/store_categary.go | 2 +- platformapi/tao_vegetable/store_test.go | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/platformapi/tao_vegetable/store_categary.go b/platformapi/tao_vegetable/store_categary.go index 787646e1..219df3b2 100644 --- a/platformapi/tao_vegetable/store_categary.go +++ b/platformapi/tao_vegetable/store_categary.go @@ -23,7 +23,7 @@ func (a *API) GetStoreAllCategory() ([]*CategoryInfo, error) { result := make([]*CategoryInfo, 0) for _, v := range parent.ChildCategorys { childNode, err := a.GetStoreCategoryInfo(v.Code) - if err != nil || len(childNode.ChildCategorys) == 0 { + if err != nil || childNode == nil { result = append(result, &CategoryInfo{ ChildCategorys: nil, Code: v.Code, diff --git a/platformapi/tao_vegetable/store_test.go b/platformapi/tao_vegetable/store_test.go index 21b10132..0fd5ea2c 100644 --- a/platformapi/tao_vegetable/store_test.go +++ b/platformapi/tao_vegetable/store_test.go @@ -62,9 +62,16 @@ func TestAddCategory(t *testing.T) { } func TestDeleteCategory(t *testing.T) { - code := "2222" - err := apiTao.DeleteStoreCategoryInfo(&request.AlibabaWdkSkuCategoryDeleteRequest{Param: &domain.AlibabaWdkSkuCategoryDeleteCategoryDo{Code: &code}}) - globals.SugarLogger.Debugf("err := %v", err) + result, _ := apiTao.GetStoreAllCategory() + for _, v := range result { + for _, v2 := range v.ChildCategorys { + err := apiTao.DeleteStoreCategoryInfo(&request.AlibabaWdkSkuCategoryDeleteRequest{Param: &domain.AlibabaWdkSkuCategoryDeleteCategoryDo{Code: &v2.Code}}) + globals.SugarLogger.Debugf("err := %v", err) + } + err := apiTao.DeleteStoreCategoryInfo(&request.AlibabaWdkSkuCategoryDeleteRequest{Param: &domain.AlibabaWdkSkuCategoryDeleteCategoryDo{Code: &v.Code}}) + globals.SugarLogger.Debugf("err := %v", err) + } + } func TestUpdateCategory(t *testing.T) { From 6c2a0bb24e32b59a191de8d45c9e3132d4def5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Jun 2023 18:11:42 +0800 Subject: [PATCH 04/12] 1 --- platformapi/tao_vegetable/store_sku.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 0954b4ae..b8534644 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -30,12 +30,13 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR for _, v := range *data.Result.Models { if *v.Success { foodList = append(foodList, VegetableResultList{ - ProductID: *v.ProductId, + ProductID: *v.Model, SkuID: *v.Model, + ErrMsg: "", }) } else { foodList = append(foodList, VegetableResultList{ - ProductID: "", + ProductID: "0", SkuID: *v.Model, ErrMsg: *v.ErrMsg, }) From 2791b496f7486b3609647bdb333cd9988389af1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 30 Jun 2023 18:18:10 +0800 Subject: [PATCH 05/12] 1 --- platformapi/tao_vegetable/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index b8534644..338620af 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -36,7 +36,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR }) } else { foodList = append(foodList, VegetableResultList{ - ProductID: "0", + ProductID: "", SkuID: *v.Model, ErrMsg: *v.ErrMsg, }) From 38ed14123ed423936a205a986d4b1c729a43d562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 09:28:16 +0800 Subject: [PATCH 06/12] 1 --- platformapi/tao_vegetable/store_sku.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 338620af..320ca77a 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -35,11 +35,15 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR ErrMsg: "", }) } else { - foodList = append(foodList, VegetableResultList{ + skuData := VegetableResultList{ ProductID: "", SkuID: *v.Model, ErrMsg: *v.ErrMsg, - }) + } + if *v.ErrCode == "F_SKU_S1_BIZ_011" { + skuData.ProductID = *v.Model + } + foodList = append(foodList) } } From 6188eb1899e4b56fb316b4960c7d6139248e2259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 09:57:37 +0800 Subject: [PATCH 07/12] 1 --- platformapi/tao_vegetable/store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 320ca77a..4ff1ea9d 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -43,7 +43,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR if *v.ErrCode == "F_SKU_S1_BIZ_011" { skuData.ProductID = *v.Model } - foodList = append(foodList) + foodList = append(foodList, skuData) } } From 68254c971be627db25888688d1bf891e7d190ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 11:15:10 +0800 Subject: [PATCH 08/12] 1 --- platformapi/tao_vegetable/store_sku.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index 4ff1ea9d..83b955a7 100644 --- a/platformapi/tao_vegetable/store_sku.go +++ b/platformapi/tao_vegetable/store_sku.go @@ -42,6 +42,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR } if *v.ErrCode == "F_SKU_S1_BIZ_011" { skuData.ProductID = *v.Model + skuData.ErrMsg = "" } foodList = append(foodList, skuData) } From 05559dfc8f9baa306c33966a47fd5cc4ad5be64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 13:54:56 +0800 Subject: [PATCH 09/12] 1 --- platformapi/tao_vegetable/order_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index 102455b6..effa28b5 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -18,7 +18,7 @@ func TestName(t *testing.T) { func TestGetOrderDetail(t *testing.T) { requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{ StoreId: utils.String2Pointer("JX668594"), - BizOrderId: utils.Int64ToPointer(5000894158854290922), + BizOrderId: utils.Int64ToPointer(5000894677248980922), }} data, err := apiTao.QueryOrderDetail(requestParam) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) From 46cb21950a598c0e721951bf1691cff6d9b6e512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 15:55:31 +0800 Subject: [PATCH 10/12] 1 --- platformapi/tao_vegetable/order_delivery.go | 1 + platformapi/tao_vegetable/order_test.go | 27 ++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index 81766e2a..57e0e9b3 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -47,6 +47,7 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques globals.SugarLogger.Debugf("进入 DeliveryFinish") client := ability591.NewAbility591(&a.client) + globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token) if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index effa28b5..3e5c52c7 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -7,7 +7,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals" - "strings" "testing" "time" ) @@ -100,10 +99,26 @@ func TestGetTransactionOrderList(t *testing.T) { } } -func TestCcc(t *testing.T) { - data := "{\n\t\"refundFee\": 100,\n\t\"merchantCode\": \"CSSJ\",\n\t\"refundReason\": \"退款原因\",\n\t\"subRefundOrders\": [\n\t\t{\n\t\t\t\"refundFee\": 100,\n\t\t\t\"maxRefundFee\": 200,\n\t\t\t\"outSubOrderId\": \"5018100091801\",\n\t\t\t\"refundAmount\": 2\n\t\t}\n\t],\n\t\"storeId\": \"S001\",\n\t\"refundDeliveryFee\": 0,\n\t\"refundPictures\": \"https://open-retail.ele.me/#/msgdoc/detail?topicName=order.partrefund.push\\u0026aopApiCategory=order_msg_group\\u0026type=push_menu\",\n\t\"bizRefundId\": \"50001110022\",\n\t\"outOrderId\": \"500120110121\",\n\t\"refundPackageFee\": 0,\n\t\"orderFrom\": 3,\n\t\"refundId\": \"50181000918\",\n\t\"remarks\": \"备注\"\n}" - resultParam := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(data, "\n", ""), "\t", ""), " ", "") +func TestPickUp(t *testing.T) { + param := &request591.AlibabaAelophyOrderWorkCallbackRequest{} + param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ + StoreId: utils.String2Pointer("JX668594"), + BizOrderId: utils.Int64ToPointer(5000894677248980922), + Status: utils.String2Pointer(OrderStatusPickedUp), + } - resultParam2 := strings.ReplaceAll(resultParam, `\u0026`, "&") - fmt.Println(resultParam2) + workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0) + workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ + BizSubOrderId: nil, + SkuCode: utils.String2Pointer("19930827"), + PickSaleQuantity: utils.String2Pointer("3"), + PickStockQuantity: utils.String2Pointer("3"), + } + workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo) + + // 出库 + param.WorkCallbackRequest.WorkCallbackSubOrderInfoList = &workCallbackSubOrderInfoList + + err := apiTao.DeliveryFinish(param) + fmt.Println(err) } From 52eb535a619004323c8465a7f065611b4c64f8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 16:06:54 +0800 Subject: [PATCH 11/12] 1 --- platformapi/tao_vegetable/order_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index 3e5c52c7..c2e834dc 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -109,7 +109,7 @@ func TestPickUp(t *testing.T) { workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0) workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ - BizSubOrderId: nil, + BizSubOrderId: utils.Int64ToPointer(5000894677248980922), SkuCode: utils.String2Pointer("19930827"), PickSaleQuantity: utils.String2Pointer("3"), PickStockQuantity: utils.String2Pointer("3"), From 432690b8b8e3b72b4dca57bc46064a739821dc88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 16:07:21 +0800 Subject: [PATCH 12/12] 1 --- platformapi/tao_vegetable/order_delivery.go | 1 + 1 file changed, 1 insertion(+) diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index 57e0e9b3..9bbc48d1 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -53,6 +53,7 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) return nil }