diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go index 6b1c0699c..288fe2db2 100644 --- a/business/partner/purchase/ebai/order.go +++ b/business/partner/purchase/ebai/order.go @@ -1,7 +1,6 @@ package ebai import ( - "errors" "fmt" "math" "strings" @@ -417,8 +416,8 @@ func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s p.trySyncCancelStatus(order.VendorOrderID) case ebaiapi.WaybillStatusNew, ebaiapi.WaybillStatusEvent, ebaiapi.WaybillStatusRequestDelivery, ebaiapi.WaybillStatusWait4Courier: err = api.EbaiAPI.OrderCancelDelivery(order.VendorOrderID) // 取消呼叫众包骑手 - case ebaiapi.WaybillStatusCourierAccepted: - err = errors.New("骑手已接单,无法转自送") + case ebaiapi.WaybillStatusCourierAccepted: // 骑手已接单,无法转自送 + err = nil } } diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index 26e415b29..d7aadcf90 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -362,6 +362,19 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap }) } } + } else if msg.Cmd == mtwmapi.MsgTypeOrderModified { + order, _, err2 := c.getOrder(msg.AppID, GetOrderIDFromMsg(msg), GetVendorStoreIDFromMsg(msg)) + if err = err2; err == nil { + localOrder, _ := partner.CurOrderManager.LoadOrder(GetOrderIDFromMsg(msg), model.VendorIDMTWM) + localOrder.ConsigneeName = order.ConsigneeName + localOrder.ConsigneeMobile = order.ConsigneeMobile + localOrder.BuyerComment = order.BuyerComment + localOrder.ExpectedDeliveredTime = order.ExpectedDeliveredTime + localOrder.ConsigneeAddress = order.ConsigneeAddress + localOrder.ConsigneeLat = order.ConsigneeLat + localOrder.ConsigneeLng = order.ConsigneeLng + dao.UpdateEntity(dao.GetDB(), localOrder, "ConsigneeName", "ConsigneeMobile", "BuyerComment", "ExpectedDeliveredTime", "ConsigneeAddress", "ConsigneeLat", "ConsigneeLng") + } } else { if status != nil { var order *model.GoodsOrder