- timer changed (TimerTypeBaseExpectedDeliveredTime).

business/controller/controller.go

@@ -75,6 +75,7 @@ func addOrderOrWaybillStatus(status *model.OrderStatus, db orm.Ormer) (isDuplica
 	return isDuplicated, err
 }
 
+// todo 最好还是改成全事件回放算了
 func LoadPendingOrders() {
 	orders := OrderManager.LoadPendingOrders()
 	globals.SugarLogger.Infof("LoadPendingOrders orders count:%d", len(orders))

business/controller/order_legacy.go

@@ -143,14 +143,17 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
 		db.Raw("DELETE FROM "+globals.JxorderTableName+" WHERE order_id = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
 		db.Raw("DELETE FROM "+globals.JxorderskuTableName+" WHERE order_id = ?", utils.Str2Int64(order.VendorOrderID)).Exec()
 	}
-
+	orderStatus := legacyMapOrderStatus(order.Status)
+	if orderStatus < JX_ORDER_STATUS_PICKING {
+		orderStatus = JX_ORDER_STATUS_PICKING
+	}
 	jxorder := &legacymodel.Jxorder2{
 		VenderId:           int8(order.VendorID),
 		OrderId:            utils.Str2Int64(order.VendorOrderID),
 		JxStoreId:          utils.Int2Str(jxutils.GetJxStoreIDFromOrder(order)),
 		JxStoreName:        order.StoreName,
 		OrderNum:           order.OrderSeq,
-		OrderStatus:        legacyMapOrderStatus(order.Status),
+		OrderStatus:        orderStatus,
 		OrderStatusTime:    utils.Time2Str(order.StatusTime),
 		BusinessTag:        businessTags,
 		SkuCount:           order.SkuCount,