- IScheduler.OnOrderStatusChanged添加order参数

business/jxcallback/orderman/orderman.go

@@ -110,6 +110,7 @@ func LoadPendingOrders() {
 		bills := FixedOrderManager.LoadPendingWaybills()
 		globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills))
 		var sortOrders StatusTimerSlice
+		orderMap := make(map[string]*model.GoodsOrder)
 		for _, order := range orders {
 			if order.Status > model.OrderStatusNew {
 				status := model.Order2Status(order)
@@ -118,6 +119,7 @@ func LoadPendingOrders() {
 			// order.Status = model.OrderStatusNew // 就是要以实际order状态来调用scheduler.OnOrderNew
 			order.StatusTime = order.OrderCreatedAt
 			sortOrders = append(sortOrders, order)
+			orderMap[jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID)] = order
 		}
 		for _, bill := range bills {
 			if bill.Status > model.WaybillStatusNew {
@@ -141,7 +143,8 @@ func LoadPendingOrders() {
 				}, order.VendorOrderID)
 			} else if status, ok := item.(*model.OrderStatus); ok {
 				jxutils.CallMsgHandlerAsync(func() {
-					scheduler.CurrentScheduler.OnOrderStatusChanged(status, true)
+					order := orderMap[jxutils.ComposeUniversalOrderID(status.VendorOrderID, status.VendorID)]
+					scheduler.CurrentScheduler.OnOrderStatusChanged(order, status, true)
 				}, status.VendorOrderID)
 			} else {
 				bill := item.(*model.Waybill)