1

platformapi/tao_vegetable/api_token.go

@@ -5,8 +5,6 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk"
 	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability304"
 	"git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability304/request"
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
 )
 
 const (
@@ -50,7 +48,6 @@ func (a *API) GetStoreToken(code, uuId string) (*StoreTokenInfo, error) {
 		Code: &code,
 	}
 	data, err := ability304.NewAbility304(&a.client).TaobaoTopAuthTokenCreate(param)
-	globals.SugarLogger.Debugf("token := %s", utils.Format4Output(data, false))
 	if err != nil {
 		return nil, err
 	}

platformapi/tao_vegetable/order_afs.go

@@ -21,11 +21,7 @@ import (
 func (a *API) AgreeUserCancel(req *request2.AlibabaTclsAelophyRefundAgreeRequest) error {
 	client := ability3156.NewAbility3156(&a.client)
 
-	data, err := client.AlibabaTclsAelophyRefundAgree(req, a.token)
+	data, _ := client.AlibabaTclsAelophyRefundAgree(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
 
 	if data.Result.ReturnCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -39,11 +35,7 @@ func (a *API) AgreeUserCancel(req *request2.AlibabaTclsAelophyRefundAgreeRequest
 func (a *API) DisAgreeUserCancel(req *request2.AlibabaTclsAelophyRefundDisagreeRequest) error {
 	client := ability3156.NewAbility3156(&a.client)
 
-	data, err := client.AlibabaTclsAelophyRefundDisagree(req, a.token)
+	data, _ := client.AlibabaTclsAelophyRefundDisagree(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
 
 	if data.Result.ReturnCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -57,11 +49,7 @@ func (a *API) DisAgreeUserCancel(req *request2.AlibabaTclsAelophyRefundDisagreeR
 func (a *API) PartialRefundReason(req *request2.AlibabaTclsAelophyRefundCsapplyrenderRequest) (*domain.AlibabaTclsAelophyRefundCsapplyrenderRefundCsApplyRenderResponseDto, error) {
 	client := ability3156.NewAbility3156(&a.client)
 
-	data, err := client.AlibabaTclsAelophyRefundCsapplyrender(req, a.token)
+	data, _ := client.AlibabaTclsAelophyRefundCsapplyrender(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -75,11 +63,7 @@ func (a *API) PartialRefundReason(req *request2.AlibabaTclsAelophyRefundCsapplyr
 func (a *API) PartialRefund(req *request2.AlibabaTclsAelophyRefundCsapplyRequest) error {
 	client := ability3156.NewAbility3156(&a.client)
 
-	data, err := client.AlibabaTclsAelophyRefundCsapply(req, a.token)
+	data, _ := client.AlibabaTclsAelophyRefundCsapply(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
 
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -158,11 +142,7 @@ func (a *API) RefundOrderFinish(c *http.Request) (*RefundOrderFinish, error) {
 func (a *API) QueryAfsOrderDetail(req *request591.AlibabaWdkOrderRefundGetRequest) (*domain591.AlibabaWdkOrderRefundGetOrderSyncRefundListResult, error) {
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaWdkOrderRefundGet(req, a.token)
+	data, _ := client.AlibabaWdkOrderRefundGet(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ReturnCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -176,11 +156,7 @@ func (a *API) QueryAfsOrderDetail(req *request591.AlibabaWdkOrderRefundGetReques
 func (a *API) QueryAfsOrderDetailList(req *request591.AlibabaWdkOrderRefundListRequest) (*domain591.AlibabaWdkOrderRefundListOrderSyncRefundListResult, error) {
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaWdkOrderRefundList(req, a.token)
+	data, _ := client.AlibabaWdkOrderRefundList(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ReturnCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -234,11 +210,7 @@ func (a *API) GetTransactionOrderListByTime(storeId string, queryData time.Time)
 func (a *API) GetTransactionOrderList(req *request591.AlibabaWdkOrderListRequest) (*domain591.AlibabaWdkOrderListResult, error) {
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaWdkOrderList(req, a.token)
+	data, _ := client.AlibabaWdkOrderList(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ReturnCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
@@ -252,11 +224,7 @@ func (a *API) GetTransactionOrderList(req *request591.AlibabaWdkOrderListRequest
 func (a *API) QueryBillList(req *request591.AlibabaWdkBillListRequest) (*domain591.AlibabaWdkBillListTxdBillListGetResult, error) {
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaWdkBillList(req, a.token)
+	data, _ := client.AlibabaWdkBillList(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))

platformapi/tao_vegetable/order_delivery.go

@@ -30,12 +30,7 @@ func (a *API) ReaderOrderInfo(c *http.Request) (*CallbackOrder, error) {
 // QueryOrderDetail 自配送查询订单详情
 func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*domain.AlibabaAelophyOrderGetOrderResponse, error) {
 	client := ability591.NewAbility591(&a.client)
-	data, err := client.AlibabaAelophyOrderGet(req, a.token)
+	data, _ := client.AlibabaAelophyOrderGet(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
-
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return nil, fmt.Errorf(*data.ApiResult.ErrMsg)
@@ -49,12 +44,7 @@ func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*do
 func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackRequest) error {
 	client := ability591.NewAbility591(&a.client)
 
-	data, err := client.AlibabaAelophyOrderWorkCallback(req, a.token)
+	data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
-
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))
 		return fmt.Errorf(*data.ApiResult.ErrMsg)

platformapi/tao_vegetable/order_test.go

@@ -1,7 +1,55 @@
 package tao_vegetable
 
-import "testing"
+import (
+	"fmt"
+	domain591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain"
+	request591 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
+	"testing"
+)
 
 func TestName(t *testing.T) {
 
 }
+func TestGetOrderDetail(t *testing.T) {
+	requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{
+		StoreId:    utils.String2Pointer("JX668594"),
+		BizOrderId: utils.Int64ToPointer(5000894158854290922),
+	}}
+	data, err := apiTao.QueryOrderDetail(requestParam)
+	globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false))
+	globals.SugarLogger.Debugf("err := %s", utils.Format4Output(err, false))
+}
+
+// 接单
+func TestDeliveryFinishACCEPTED(t *testing.T) {
+	param := &request591.AlibabaAelophyOrderWorkCallbackRequest{}
+	param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
+		StoreId:                      utils.String2Pointer("JX668594"),
+		BizOrderId:                   utils.Int64ToPointer(5000894158854290922),
+		Status:                       utils.String2Pointer("ACCEPTED"),
+		StatusRemark:                 nil,
+		DelivererName:                nil,
+		DelivererPhone:               nil,
+		WorkCallbackSubOrderInfoList: nil,
+		DelivererCompany:             nil,
+		LogisticsNo:                  nil,
+	}
+	err := apiTao.DeliveryFinish(param)
+	fmt.Println(err)
+}
+
+// 取消订单
+func TestDeliveryFinishREJECTED(t *testing.T) {
+	// 发送取消状态,商户取消
+	err := apiTao.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{
+		WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{
+			StoreId:    utils.String2Pointer("JX668594"),
+			BizOrderId: utils.Int64ToPointer(5000894158854290922),
+			Status:     utils.String2Pointer("REJECTED"),
+		},
+	})
+
+	fmt.Println(err)
+}

platformapi/tao_vegetable/sdk/ability591/domain/AlibabaAelophyOrderGetOrderGetRequest.go

@@ -1,22 +1,20 @@
 package domain
 
-
 type AlibabaAelophyOrderGetOrderGetRequest struct {
-    /*
+	/*
-        经营店编码     */
+	   经营店编码    kk */
-    StoreId  *string `json:"store_id,omitempty" `
+	StoreId *string `json:"store_id,omitempty" `
-
-    /*
-        五道口订单编码     */
-    BizOrderId  *int64 `json:"biz_order_id,omitempty" `
 
+	/*
+	   五道口订单编码     */
+	BizOrderId *int64 `json:"biz_order_id,omitempty" `
 }
 
 func (s *AlibabaAelophyOrderGetOrderGetRequest) SetStoreId(v string) *AlibabaAelophyOrderGetOrderGetRequest {
-    s.StoreId = &v
+	s.StoreId = &v
-    return s
+	return s
 }
 func (s *AlibabaAelophyOrderGetOrderGetRequest) SetBizOrderId(v int64) *AlibabaAelophyOrderGetOrderGetRequest {
-    s.BizOrderId = &v
+	s.BizOrderId = &v
-    return s
+	return s
 }

platformapi/tao_vegetable/store_categary.go

@@ -42,10 +42,8 @@ func (a *API) GetStoreAllCategory() ([]*CategoryInfo, error) {
 // GetStoreCategoryInfo 获取门店指定分类
 func (a *API) GetStoreCategoryInfo(code string) (*CategoryInfo, error) {
 	storeCategory := ability587.NewAbility587(&a.client)
-	resp, err := storeCategory.AlibabaWdkSkuCategoryQuery(&request.AlibabaWdkSkuCategoryQueryRequest{Param: &domain.AlibabaWdkSkuCategoryQueryCategoryDo{Code: &code}}, a.token)
+	resp, _ := storeCategory.AlibabaWdkSkuCategoryQuery(&request.AlibabaWdkSkuCategoryQueryRequest{Param: &domain.AlibabaWdkSkuCategoryQueryCategoryDo{Code: &code}}, a.token)
-	if err != nil {
+
-		return nil, err
-	}
 	if resp.Result.ErrMsg != nil {
 		return nil, fmt.Errorf("requestId:" + resp.RequestId + "msg:" + *resp.Result.ErrMsg)
 	}
@@ -60,10 +58,8 @@ func (a *API) GetStoreCategoryInfo(code string) (*CategoryInfo, error) {
 // AddStoreCategoryInfo 添加门店分类
 func (a *API) AddStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryAddRequest) (string, error) {
 	storeCategory := ability587.NewAbility587(&a.client)
-	resp, err := storeCategory.AlibabaWdkSkuCategoryAdd(param, a.token)
+	resp, _ := storeCategory.AlibabaWdkSkuCategoryAdd(param, a.token)
-	if err != nil {
+
-		return "", err
-	}
 	if !*resp.Result.Success {
 		return "", fmt.Errorf(*resp.Result.ErrMsg)
 	}
@@ -74,10 +70,8 @@ func (a *API) AddStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryAddReques
 // DeleteStoreCategoryInfo 删除门店分类
 func (a *API) DeleteStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryDeleteRequest) error {
 	storeCategory := ability587.NewAbility587(&a.client)
-	resp, err := storeCategory.AlibabaWdkSkuCategoryDelete(param, a.token)
+	resp, _ := storeCategory.AlibabaWdkSkuCategoryDelete(param, a.token)
-	if err != nil {
+
-		return err
-	}
 	if !*resp.Result.Success {
 		return fmt.Errorf(*resp.Result.ErrMsg)
 	}
@@ -88,10 +82,8 @@ func (a *API) DeleteStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryDelete
 // UpdateStoreCategoryInfo 修改门店分类
 func (a *API) UpdateStoreCategoryInfo(param *request.AlibabaWdkSkuCategoryUpdateRequest) error {
 	storeCategory := ability587.NewAbility587(&a.client)
-	resp, err := storeCategory.AlibabaWdkSkuCategoryUpdate(param, a.token)
+	resp, _ := storeCategory.AlibabaWdkSkuCategoryUpdate(param, a.token)
-	if err != nil {
+
-		return err
-	}
 	if !*resp.Result.Success {
 		return fmt.Errorf(*resp.Result.ErrMsg)
 	}

platformapi/tao_vegetable/store_sku.go

@@ -18,11 +18,7 @@ import (
 func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableResultList, error) {
 	client := ability585.NewAbility585(&a.client)
 
-	data, err := client.AlibabaWdkSkuAdd(param, a.token)
+	data, _ := client.AlibabaWdkSkuAdd(param, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false))
@@ -45,11 +41,7 @@ func (a *API) AddStoreSku(param *request.AlibabaWdkSkuAddRequest) (*[]VegetableR
 func (a *API) UpdateStoreSku(param *request.AlibabaWdkSkuUpdateRequest) (*[]VegetableResultList, error) {
 	client := ability585.NewAbility585(&a.client)
 
-	data, err := client.AlibabaWdkSkuUpdate(param, a.token)
+	data, _ := client.AlibabaWdkSkuUpdate(param, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false))
@@ -75,11 +67,7 @@ func (a *API) UpdateStoreSku(param *request.AlibabaWdkSkuUpdateRequest) (*[]Vege
 func (a *API) QueryStoreSKu(param *request.AlibabaWdkSkuQueryRequest) (*[]domain.AlibabaWdkSkuQueryApiResult, error) {
 	client := ability585.NewAbility585(&a.client)
 
-	data, err := client.AlibabaWdkSkuQuery(param, a.token)
+	data, _ := client.AlibabaWdkSkuQuery(param, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return nil, err
-	}
 
 	if data.Result.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.Result, false))
@@ -98,11 +86,7 @@ func (a *API) DeleteStoreSku() {
 func (a *API) StoreSkuUpdateOffShelf(param *request2.AlibabaAxChannelSkuStatusUpdateRequest) error {
 	client := ability587.NewAbility587(&a.client)
 
-	data, err := client.AlibabaAxChannelSkuStatusUpdate(param, a.token)
+	data, _ := client.AlibabaAxChannelSkuStatusUpdate(param, a.token)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
 
 	if data.ApiResult.ErrCode != nil {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data.ApiResult, false))
@@ -116,11 +100,7 @@ func (a *API) StoreSkuUpdateOffShelf(param *request2.AlibabaAxChannelSkuStatusUp
 func (a *API) StoreSkuStock(param *request589.AlibabaWdkStockPublishRequest) error {
 	client := ability589.NewAbility589(&a.client)
 
-	data, err := client.AlibabaWdkStockPublish(param)
+	data, _ := client.AlibabaWdkStockPublish(param)
-	if err != nil {
-		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(err, false))
-		return err
-	}
 
 	if data.MsgCode != "" {
 		globals.SugarLogger.Debugf("requestId[%s],err[%s]", data.RequestId, utils.Format4Output(data, false))