- build version, git info added.

business/controller/controller.go

@@ -81,55 +81,57 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica
 func LoadPendingOrders() {
 	orders := OrderManager.LoadPendingOrders()
 	globals.SugarLogger.Infof("LoadPendingOrders orders count:%d", len(orders))
-	bills := WaybillManager.LoadPendingWaybills()
-	globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills))
 
-	var sortOrders StatusTimerSlice
-	for _, order := range orders {
-		if order.Status > model.OrderStatusNew {
-			status := model.Order2Status(order)
-			sortOrders = append(sortOrders, status)
+	ordersCount := len(orders)
+	if ordersCount > 0 {
+		bills := WaybillManager.LoadPendingWaybills()
+		globals.SugarLogger.Infof("LoadPendingOrders waybills count:%d", len(bills))
+		var sortOrders StatusTimerSlice
+		for _, order := range orders {
+			if order.Status > model.OrderStatusNew {
+				status := model.Order2Status(order)
+				sortOrders = append(sortOrders, status)
+			}
+			// order.Status = model.OrderStatusNew // 就是要以实际order状态来调用scheduler.OnOrderNew
+			order.StatusTime = order.OrderCreatedAt
+			sortOrders = append(sortOrders, order)
 		}
-		// order.Status = model.OrderStatusNew // 就是要以实际order状态来调用scheduler.OnOrderNew
-		order.StatusTime = order.OrderCreatedAt
-		sortOrders = append(sortOrders, order)
-	}
-	for _, bill := range bills {
-		if bill.Status > model.WaybillStatusNew {
-			bill2 := *bill
-			sortOrders = append(sortOrders, &bill2)
+		for _, bill := range bills {
+			if bill.Status > model.WaybillStatusNew {
+				bill2 := *bill
+				sortOrders = append(sortOrders, &bill2)
+			}
+			bill.Status = model.WaybillStatusNew
+			bill.StatusTime = bill.WaybillCreatedAt
+			sortOrders = append(sortOrders, bill)
 		}
-		bill.Status = model.WaybillStatusNew
-		bill.StatusTime = bill.WaybillCreatedAt
-		sortOrders = append(sortOrders, bill)
-	}
-	sort.Sort(sortOrders)
-
-	sleepGap := maxTimeHandlePendingOrder / time.Duration(len(sortOrders))
-	if sleepGap > maxSleepGapHandlePendingOrder {
-		sleepGap = maxSleepGapHandlePendingOrder
-	}
-	lastTime := time.Now()
-	for _, item := range sortOrders {
-		if order, ok := item.(*model.GoodsOrder); ok {
-			jxutils.CallMsgHandlerAsync(func() {
-				scheduler.CurrentScheduler.OnOrderNew(order, true)
-			}, order.VendorOrderID)
-		} else if status, ok := item.(*model.OrderStatus); ok {
-			jxutils.CallMsgHandlerAsync(func() {
-				scheduler.CurrentScheduler.OnOrderStatusChanged(status, true)
-			}, status.VendorOrderID)
-		} else {
-			bill := item.(*model.Waybill)
-			jxutils.CallMsgHandlerAsync(func() {
-				scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, true)
-			}, bill.VendorOrderID)
+		sort.Sort(sortOrders)
+		sleepGap := maxTimeHandlePendingOrder / time.Duration(ordersCount)
+		if sleepGap > maxSleepGapHandlePendingOrder {
+			sleepGap = maxSleepGapHandlePendingOrder
 		}
-		curTime := time.Now()
-		timeout := sleepGap - curTime.Sub(lastTime)
-		if timeout > 0 {
-			time.Sleep(timeout)
+		lastTime := time.Now()
+		for _, item := range sortOrders {
+			if order, ok := item.(*model.GoodsOrder); ok {
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnOrderNew(order, true)
+				}, order.VendorOrderID)
+			} else if status, ok := item.(*model.OrderStatus); ok {
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnOrderStatusChanged(status, true)
+				}, status.VendorOrderID)
+			} else {
+				bill := item.(*model.Waybill)
+				jxutils.CallMsgHandlerAsync(func() {
+					scheduler.CurrentScheduler.OnWaybillStatusChanged(bill, true)
+				}, bill.VendorOrderID)
+			}
+			curTime := time.Now()
+			timeout := sleepGap - curTime.Sub(lastTime)
+			if timeout > 0 {
+				time.Sleep(timeout)
+			}
+			lastTime = curTime
 		}
-		lastTime = curTime
 	}
 }