diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index 81766e2a..9bbc48d1 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -47,11 +47,13 @@ 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)) return fmt.Errorf(*data.ApiResult.ErrMsg) } + globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) return nil } diff --git a/platformapi/tao_vegetable/order_test.go b/platformapi/tao_vegetable/order_test.go index 102455b6..c2e834dc 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" ) @@ -18,7 +17,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)) @@ -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: utils.Int64ToPointer(5000894677248980922), + 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) } 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_sku.go b/platformapi/tao_vegetable/store_sku.go index 7f0e137c..83b955a7 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) @@ -28,11 +28,25 @@ 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.Model, + SkuID: *v.Model, + ErrMsg: "", + }) + } else { + skuData := VegetableResultList{ + ProductID: "", + SkuID: *v.Model, + ErrMsg: *v.ErrMsg, + } + if *v.ErrCode == "F_SKU_S1_BIZ_011" { + skuData.ProductID = *v.Model + skuData.ErrMsg = "" + } + foodList = append(foodList, skuData) + } + } return &foodList, nil 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) {