From b8aad94c9fec392221d653ae262fbb4f1add0721 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 09:47:40 +0800 Subject: [PATCH] 1 --- platformapi/tao_vegetable/api_token.go | 4 ++++ platformapi/tao_vegetable/order_afs.go | 14 +++++++------- platformapi/tao_vegetable/order_delivery.go | 13 +++++-------- platformapi/tao_vegetable/sdk/topclient.go | 4 +--- platformapi/tao_vegetable/store_categary.go | 2 +- platformapi/tao_vegetable/store_sku.go | 10 +++++----- 6 files changed, 23 insertions(+), 24 deletions(-) diff --git a/platformapi/tao_vegetable/api_token.go b/platformapi/tao_vegetable/api_token.go index f152b850..b87f1da5 100644 --- a/platformapi/tao_vegetable/api_token.go +++ b/platformapi/tao_vegetable/api_token.go @@ -39,6 +39,10 @@ func (a *API) SetToken(token string) { a.token = token } +func (a *API) GetToken() string { + return a.token +} + func (a *API) SetRefreshToken(refreshToken string) { a.refreshToken = refreshToken } diff --git a/platformapi/tao_vegetable/order_afs.go b/platformapi/tao_vegetable/order_afs.go index 84e7cfa0..be26ef0a 100644 --- a/platformapi/tao_vegetable/order_afs.go +++ b/platformapi/tao_vegetable/order_afs.go @@ -23,7 +23,7 @@ func (a *API) AgreeUserCancel(req *request2.AlibabaTclsAelophyRefundAgreeRequest data, _ := client.AlibabaTclsAelophyRefundAgree(req, a.token) - if data.Result.ReturnCode != nil { + if !*data.Result.IsSuccess { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.Result.ReturnMsg) } @@ -37,7 +37,7 @@ func (a *API) DisAgreeUserCancel(req *request2.AlibabaTclsAelophyRefundDisagreeR data, _ := client.AlibabaTclsAelophyRefundDisagree(req, a.token) - if data.Result.ReturnCode != nil { + if !*data.Result.IsSuccess { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.Result.ReturnMsg) } @@ -51,7 +51,7 @@ func (a *API) PartialRefundReason(req *request2.AlibabaTclsAelophyRefundCsapplyr data, _ := client.AlibabaTclsAelophyRefundCsapplyrender(req, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return nil, fmt.Errorf(*data.ApiResult.ErrMsg) } @@ -65,7 +65,7 @@ func (a *API) PartialRefund(req *request2.AlibabaTclsAelophyRefundCsapplyRequest data, _ := client.AlibabaTclsAelophyRefundCsapply(req, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } @@ -144,7 +144,7 @@ func (a *API) QueryAfsOrderDetail(req *request591.AlibabaWdkOrderRefundGetReques data, _ := client.AlibabaWdkOrderRefundGet(req, a.token) - if data.Result.ReturnCode != nil { + if !*data.Result.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return nil, fmt.Errorf(*data.Result.ReturnMsg) } @@ -158,7 +158,7 @@ func (a *API) QueryAfsOrderDetailList(req *request591.AlibabaWdkOrderRefundListR data, _ := client.AlibabaWdkOrderRefundList(req, a.token) - if data.Result.ReturnCode != nil { + if !*data.Result.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return nil, fmt.Errorf(*data.Result.ReturnMsg) } @@ -225,7 +225,7 @@ func (a *API) QueryBillList(req *request591.AlibabaWdkBillListRequest) (*domain5 data, _ := client.AlibabaWdkBillList(req, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return nil, fmt.Errorf(*data.ApiResult.ErrMsg) } diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index cd51a4ce..bae76c3a 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -31,7 +31,8 @@ func (a *API) ReaderOrderInfo(c *http.Request) (*CallbackOrder, error) { func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*domain.AlibabaAelophyOrderGetOrderResponse, error) { client := ability591.NewAbility591(&a.client) data, _ := client.AlibabaAelophyOrderGet(req, a.token) - if data.ApiResult.ErrCode != nil { + + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return nil, fmt.Errorf(*data.ApiResult.ErrMsg) } @@ -45,7 +46,7 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques client := ability591.NewAbility591(&a.client) data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } @@ -57,13 +58,9 @@ func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackReques func (a *API) DeliveryTrajectory(req *request2.AlibabaAelophyOrderLogisticsTraceCallbackRequest) error { client := ability591.NewAbility591(&a.client) - data, err := client.AlibabaAelophyOrderLogisticsTraceCallback(req, a.token) - if err != nil { - globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false)) - return err - } + data, _ := client.AlibabaAelophyOrderLogisticsTraceCallback(req, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } diff --git a/platformapi/tao_vegetable/sdk/topclient.go b/platformapi/tao_vegetable/sdk/topclient.go index e7a541d0..f38db0f0 100644 --- a/platformapi/tao_vegetable/sdk/topclient.go +++ b/platformapi/tao_vegetable/sdk/topclient.go @@ -4,8 +4,6 @@ import ( "bytes" "fmt" util2 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/util" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "io" "io/ioutil" "log" @@ -94,7 +92,7 @@ func (client *TopClient) ExecuteWithSession(method string, data map[string]inter if session != "" { publicParam["session"] = session } - globals.SugarLogger.Debugf("参数校验publicParam=%s", utils.Format4Output(publicParam, false)) + sign := util2.GetSign(publicParam, data, client.AppSecret) // 构建url serverUrl, _ := url.Parse(client.ServerUrl) diff --git a/platformapi/tao_vegetable/store_categary.go b/platformapi/tao_vegetable/store_categary.go index 3843551a..07963ca7 100644 --- a/platformapi/tao_vegetable/store_categary.go +++ b/platformapi/tao_vegetable/store_categary.go @@ -44,7 +44,7 @@ func (a *API) GetStoreCategoryInfo(code string) (*CategoryInfo, error) { storeCategory := ability587.NewAbility587(&a.client) resp, _ := storeCategory.AlibabaWdkSkuCategoryQuery(&request.AlibabaWdkSkuCategoryQueryRequest{Param: &domain.AlibabaWdkSkuCategoryQueryCategoryDo{Code: &code}}, a.token) - if resp.Result.ErrMsg != nil { + if !*resp.Result.Success { return nil, fmt.Errorf("requestId:" + resp.RequestId + "msg:" + *resp.Result.ErrMsg) } var info *CategoryInfo diff --git a/platformapi/tao_vegetable/store_sku.go b/platformapi/tao_vegetable/store_sku.go index e0f9ddee..cff661e9 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 data, _ := client.AlibabaWdkSkuAdd(param, a.token) - if data.Result.ErrCode != nil { + 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) } @@ -43,7 +43,7 @@ func (a *API) UpdateStoreSku(param *request.AlibabaWdkSkuUpdateRequest) (*[]Vege data, _ := client.AlibabaWdkSkuUpdate(param, a.token) - if data.Result.ErrCode != nil { + 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) } @@ -69,7 +69,7 @@ func (a *API) QueryStoreSKu(param *request.AlibabaWdkSkuQueryRequest) (*[]domain data, _ := client.AlibabaWdkSkuQuery(param, a.token) - if data.Result.ErrCode != nil { + 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) } @@ -88,7 +88,7 @@ func (a *API) StoreSkuUpdateOffShelf(param *request2.AlibabaAxChannelSkuStatusUp data, _ := client.AlibabaAxChannelSkuStatusUpdate(param, a.token) - if data.ApiResult.ErrCode != nil { + if !*data.ApiResult.Success { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.ApiResult, false)) return fmt.Errorf(*data.ApiResult.ErrMsg) } @@ -102,7 +102,7 @@ func (a *API) StoreSkuStock(param *request589.AlibabaWdkStockPublishRequest) err data, _ := client.AlibabaWdkStockPublish(param) - if data.MsgCode != "" { + if !data.IsSuccess { globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false)) return fmt.Errorf(data.Message) }