From a422472cfba4710249fe7b40f5cdb4dd5f31acf0 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 31 Jan 2023 17:29:18 +0800 Subject: [PATCH] 1 --- business/partner/delivery/uupt/waybill.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index 5e8a5934b..e48003e73 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -154,9 +154,9 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i "callme_withtake": uuptapi.CallMeWithTakeYes, } //test - apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") - if orderCode, originID, err := apis.AddOrder(param); err != nil { - //if orderCode, originID, err := api.UuAPI.AddOrder(param); err != nil { + //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") + //if orderCode, originID, err := apis.AddOrder(param); err != nil { + if orderCode, originID, err := api.UuAPI.AddOrder(param); err != nil { return nil, err } else { bill = &model.Waybill{ @@ -173,9 +173,9 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i } func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) { - apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") - if err = apis.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { - //if err = api.UuAPI.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { + //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") + //if err = apis.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { + if err = api.UuAPI.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { return err } bill.Status = model.WaybillStatusCanceled @@ -265,9 +265,9 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe "to_lng": coords[1].Lng, } //test - apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") - if orderPrice, err = apis.GetOrderPrice(param); err != nil { - //if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil { + //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") + //if orderPrice, err = apis.GetOrderPrice(param); err != nil { + if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil { return nil, err } else { return orderPrice, nil