From 421871334e0b33204e3b03ef5831e1a86d492b10 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 30 Nov 2018 20:55:10 +0800
Subject: [PATCH] - saveOrder don't use unsuitable status.

---
 business/jxcallback/orderman/order.go | 29 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 4f15df437..b34f436c3 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -130,19 +130,24 @@ func (c *OrderManager) saveOrder(order *model.GoodsOrder, isAdjust bool, db orm.
 	order.WaybillVendorID = model.VendorIDUnknown
 	order.OrderFinishedAt = utils.DefaultTimeValue
 
-	// hardcode 兼容京东消息错序问题
-	orderStatus := &model.OrderStatus{}
-	if db.Raw(`
-	SELECT *
-	FROM order_status
-	WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ?
-	ORDER BY status_time DESC
-	LIMIT 1
-	`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID).QueryRow(orderStatus) == nil {
-		order.Status = orderStatus.Status
-		order.VendorStatus = orderStatus.VendorStatus
-		order.StatusTime = orderStatus.StatusTime
+	// todo hardcode 兼容京东消息错序问题
+	if true { //order.VendorID == model.VendorIDJD {
+		orderStatus := &model.OrderStatus{}
+		if db.Raw(`
+		SELECT *
+		FROM order_status
+		WHERE order_type = ? AND vendor_order_id = ? AND vendor_id = ?
+		ORDER BY status_time DESC
+		LIMIT 1
+		`, model.OrderTypeOrder, order.VendorOrderID, order.VendorID).QueryRow(orderStatus) == nil {
+			if orderStatus.Status > order.Status {
+				order.Status = orderStatus.Status
+				order.VendorStatus = orderStatus.VendorStatus
+				order.StatusTime = orderStatus.StatusTime
+			}
+		}
 	}
+
 	order.OrderCreatedAt = order.StatusTime
 
 	// globals.SugarLogger.Debugf("saveOrder isAdjust:%t, order:%v", isAdjust, order)