diff --git a/business/controller/elm/waybill.go b/business/controller/elm/waybill.go index 351c68030..3ea36014e 100644 --- a/business/controller/elm/waybill.go +++ b/business/controller/elm/waybill.go @@ -44,7 +44,7 @@ func (c *WaybillController) onWaybillStatusMsg(msg *elmapi.CallbackWaybillStatus msg.MsgType != elmapi.MsgTypeDeiverBySelf { order.Status = model.WaybillStatusFailed } else { - // MsgTypeWait4Courier + // MsgTypeWaybillWait4DeliveryVendor // MsgTypeDeiverBySelf order.Status = model.WaybillStatusUnknown } diff --git a/business/controller/order.go b/business/controller/order.go index c86267b69..2ca50258b 100644 --- a/business/controller/order.go +++ b/business/controller/order.go @@ -245,7 +245,7 @@ func (c *OrderController) addOrderStatus(orderStatus *model.OrderStatus, db orm. db = orm.NewOrm() } isDuplicated, err = addOrderOrWaybillStatus(orderStatus, db) - if err == nil && !isDuplicated && orderStatus.Status > model.OrderStatusNew { + if err == nil && !isDuplicated && orderStatus.Status > model.OrderStatusUnknown { params := orm.Params{ "status": orderStatus.Status, "vendor_status": orderStatus.VendorStatus, diff --git a/business/controller/waybill.go b/business/controller/waybill.go index 1ddb7ece0..58484ee7a 100644 --- a/business/controller/waybill.go +++ b/business/controller/waybill.go @@ -94,7 +94,7 @@ func (w *WaybillController) OnWaybillStatusChanged(bill *model.Waybill) (err err func (w *WaybillController) addWaybillStatus(bill *model.Waybill, db orm.Ormer, addParams orm.Params) (isDuplicated bool, err error) { waybillStatus := model.Waybill2Status(bill) isDuplicated, err = addOrderOrWaybillStatus(waybillStatus, db) - if err == nil && !isDuplicated && waybillStatus.Status > model.WaybillStatusNew { + if err == nil && !isDuplicated && waybillStatus.Status > model.WaybillStatusUnknown { params := utils.MergeMaps(orm.Params{ "status": bill.Status, "vendor_status": bill.VendorStatus,