diff --git a/platformapi/tao_vegetable/order_delivery.go b/platformapi/tao_vegetable/order_delivery.go index 4e107fb6..2123ccaa 100644 --- a/platformapi/tao_vegetable/order_delivery.go +++ b/platformapi/tao_vegetable/order_delivery.go @@ -6,8 +6,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/domain" request2 "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability591/request" - "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/globals" "io/ioutil" "net/http" ) @@ -44,16 +42,17 @@ func (a *API) QueryOrderDetail(req *request2.AlibabaAelophyOrderGetRequest) (*do // DeliveryFinish 订单一下的没一个状态通知接口 // ACCEPTED = 商户接单 REJECTED = 商户取消订单 PICKED = 拣货完成 PACKAGED = 打包出库 SHIPPING = 开始配送 SIGN = 用户签收 REFUSED = 用户拒收 func (a *API) DeliveryFinish(req *request2.AlibabaAelophyOrderWorkCallbackRequest) error { - globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false)) + //globals.SugarLogger.Debugf("进入 DeliveryFinish: %s", utils.Format4Output(req, false)) client := ability591.NewAbility591(&a.client) - globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) - data, _ := client.AlibabaAelophyOrderWorkCallback(req, a.token) + //globals.SugarLogger.Debugf("param := %s", utils.Format4Output(req, false)) + data, err := client.AlibabaAelophyOrderWorkCallback(req, a.token) + fmt.Println(err) if data != nil && !*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)) + //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 497d740b..11fd7dd2 100644 --- a/platformapi/tao_vegetable/order_test.go +++ b/platformapi/tao_vegetable/order_test.go @@ -22,8 +22,8 @@ func TestName(t *testing.T) { } func TestGetOrderDetail(t *testing.T) { requestParam := &request591.AlibabaAelophyOrderGetRequest{OrderGetRequest: &domain591.AlibabaAelophyOrderGetOrderGetRequest{ - StoreId: utils.String2Pointer("JX666708"), - BizOrderId: utils.Int64ToPointer(5000910858776180489), + StoreId: utils.String2Pointer("JX101983"), + BizOrderId: utils.Int64ToPointer(5000921008118200880), }} data, err := apiTao.QueryOrderDetail(requestParam) globals.SugarLogger.Debugf("data := %s", utils.Format4Output(data, false)) @@ -135,20 +135,44 @@ func TestGetTransactionOrderList(t *testing.T) { func TestPickUp(t *testing.T) { param := &request591.AlibabaAelophyOrderWorkCallbackRequest{} param.WorkCallbackRequest = &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ - StoreId: utils.String2Pointer("JX11983"), - BizOrderId: utils.Int64ToPointer(5000900604228190922), - Status: utils.String2Pointer("SHIPPING"), + StoreId: utils.String2Pointer("JX101983"), + BizOrderId: utils.Int64ToPointer(5000921008118200880), + Status: utils.String2Pointer("PICKED"), } workCallbackSubOrderInfoList := make([]domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo, 0, 0) workCallbackSubOrderInfo := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ - BizSubOrderId: utils.Int64ToPointer(3422286108419706112), - SkuCode: utils.String2Pointer("19930827"), - PickSaleQuantity: utils.String2Pointer("3"), - PickStockQuantity: utils.String2Pointer("3"), + BizSubOrderId: utils.Int64ToPointer(5000921008118210880), + SkuCode: utils.String2Pointer("39132"), + PickSaleQuantity: utils.String2Pointer("1"), + PickStockQuantity: utils.String2Pointer("1"), } workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo) + workCallbackSubOrderInfo2 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ + BizSubOrderId: utils.Int64ToPointer(5000921008118220880), + SkuCode: utils.String2Pointer("6093937"), + PickSaleQuantity: utils.String2Pointer("2"), + PickStockQuantity: utils.String2Pointer("2"), + } + workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo2) + + workCallbackSubOrderInfo3 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ + BizSubOrderId: utils.Int64ToPointer(5000921008118230880), + SkuCode: utils.String2Pointer("6045098"), + PickSaleQuantity: utils.String2Pointer("1"), + PickStockQuantity: utils.String2Pointer("1"), + } + workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo3) + + workCallbackSubOrderInfo4 := domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackSubOrderInfo{ + BizSubOrderId: utils.Int64ToPointer(5000921008118240880), + SkuCode: utils.String2Pointer("24342"), + PickSaleQuantity: utils.String2Pointer("1"), + PickStockQuantity: utils.String2Pointer("1"), + } + workCallbackSubOrderInfoList = append(workCallbackSubOrderInfoList, workCallbackSubOrderInfo4) + // 出库 param.WorkCallbackRequest.WorkCallbackSubOrderInfoList = &workCallbackSubOrderInfoList