- big refactor for scheduler.
This commit is contained in:
@@ -49,6 +49,12 @@ func init() {
|
||||
}
|
||||
|
||||
func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplicated bool, err error) {
|
||||
if status.OrderType == model.OrderTypeOrder {
|
||||
globals.SugarLogger.Debugf("addOrderStatus order:%v", status)
|
||||
} else {
|
||||
globals.SugarLogger.Debugf("addOrderStatus waybill:%v", status)
|
||||
}
|
||||
|
||||
status.ID = 0
|
||||
created, _, err := db.ReadOrCreate(status, "VendorOrderID", "VendorID", "OrderType", "VendorStatus", "StatusTime")
|
||||
if err == nil {
|
||||
@@ -99,17 +105,17 @@ func LoadPendingOrders() {
|
||||
if order, ok := item.(*model.GoodsOrder); ok {
|
||||
if order.Status == model.OrderStatusNew {
|
||||
jxutils.CallMsgHandlerAsync(func() {
|
||||
scheduler.CurrentScheduler.OnOrderNew(order)
|
||||
scheduler.CurrentScheduler.OnOrderNew(order, true)
|
||||
}, order.VendorOrderID)
|
||||
} else {
|
||||
jxutils.CallMsgHandlerAsync(func() {
|
||||
scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order))
|
||||
scheduler.CurrentScheduler.OnOrderStatusChanged(model.Order2Status(order), true)
|
||||
}, order.VendorOrderID)
|
||||
}
|
||||
} else {
|
||||
bill := item.(*model.Waybill)
|
||||
jxutils.CallMsgHandlerAsync(func() {
|
||||
scheduler.CurrentScheduler.OnWaybillStatusChanged(bill)
|
||||
scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, true)
|
||||
}, bill.VendorOrderID)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user