This commit is contained in:
richboo111
2023-01-31 17:29:18 +08:00
parent 51ef54c81d
commit a422472cfb

View File

@@ -154,9 +154,9 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i
"callme_withtake": uuptapi.CallMeWithTakeYes, "callme_withtake": uuptapi.CallMeWithTakeYes,
} }
//test //test
apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246")
if orderCode, originID, err := apis.AddOrder(param); err != nil { //if orderCode, originID, err := apis.AddOrder(param); err != nil {
//if orderCode, originID, err := api.UuAPI.AddOrder(param); err != nil { if orderCode, originID, err := api.UuAPI.AddOrder(param); err != nil {
return nil, err return nil, err
} else { } else {
bill = &model.Waybill{ 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) { func (d DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, cancelReason string) (err error) {
apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246")
if err = apis.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { //if err = apis.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil {
//if err = api.UuAPI.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil { if err = api.UuAPI.CancelOrder(bill.VendorWaybillID, uuptapi.CancelReasonNormal); err != nil {
return err return err
} }
bill.Status = model.WaybillStatusCanceled bill.Status = model.WaybillStatusCanceled
@@ -265,9 +265,9 @@ func getOrderPrice(order *model.GoodsOrder) (orderPrice *uuptapi.GetOrderPriceRe
"to_lng": coords[1].Lng, "to_lng": coords[1].Lng,
} }
//test //test
apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246") //apis := uuptapi.New("ccba8bd4a2d54a2fb6df97e87979f303", "2815a7a1f8e3405d81fd6263683ec4e7", "910a0dfd12bb4bc0acec147bcb1ae246")
if orderPrice, err = apis.GetOrderPrice(param); err != nil { //if orderPrice, err = apis.GetOrderPrice(param); err != nil {
//if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil { if orderPrice, err = api.UuAPI.GetOrderPrice(param); err != nil {
return nil, err return nil, err
} else { } else {
return orderPrice, nil return orderPrice, nil