diff --git a/business/controller/order.go b/business/controller/order.go index 7c4840115..409dfba5e 100644 --- a/business/controller/order.go +++ b/business/controller/order.go @@ -250,6 +250,7 @@ func (c *OrderController) LoadOrder(vendorOrderID string, vendorID int) (order * //Waybill func (c *OrderController) UpdateWaybillVendorID(bill *model.Waybill) (err error) { + globals.SugarLogger.Debugf("UpdateWaybillVendorID bill:%v", bill) db := orm.NewOrm() params := orm.Params{ "waybill_vendor_id": bill.WaybillVendorID, diff --git a/business/scheduler/defsch/defsch.go b/business/scheduler/defsch/defsch.go index 810595d3c..8275b2954 100644 --- a/business/scheduler/defsch/defsch.go +++ b/business/scheduler/defsch/defsch.go @@ -146,9 +146,8 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill) (err error) { } switch bill.Status { case model.WaybillStatusAccepted: - s.cancelOtherWaybills(savedOrderInfo, bill) - if savedOrderInfo.order.WaybillVendorID == model.WaybillStatusUnknown { + s.cancelOtherWaybills(savedOrderInfo, bill) s.CurOrderManager.UpdateWaybillVendorID(bill) savedOrderInfo.order.WaybillVendorID = bill.WaybillVendorID } else {