- add OrderStatusFinishedPickup in legacyMapOrderStatus.

business/controller/order_legacy.go

@@ -94,6 +94,8 @@ func legacyMapOrderStatus(orderStatus int) (retVal int8) {
 		retVal = JX_ORDER_STATUS_EXCEPTION_APPLY
 	case model.OrderStatusCanceled:
 		retVal = JX_ORDER_STATUS_CANCEL
+	case model.OrderStatusFinishedPickup:
+		retVal = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
 	default:
 		retVal = JX_STATUS_UNKNOWN
 	}
@@ -166,7 +168,9 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
 		OrderDiscountMoney: int(order.SalePrice - order.ActualPayPrice),
 		// DeliveryPackageWeight: float64(order.Weight) / 1000,
 	}
-
+	if order.VendorID == model.VendorIDELM {
+		order.Status = model.OrderStatusFinishedPickup
+	}
 	if order.ExpectedDeliveredTime.Sub(utils.DefaultTimeValue) > 0 {
 		jxorder.OrderPreEndDelivTime = utils.Time2Str(order.ExpectedDeliveredTime)
 	}
@@ -218,6 +222,11 @@ func (c *OrderController) legacyWriteJxOrder(order *model.GoodsOrder, db orm.Orm
 func (c *OrderController) legacyJxOrderStatusChanged(status *model.OrderStatus, db orm.Ormer) (err error) {
 	orderStatus := legacyMapOrderStatus(status.Status)
 	if orderStatus != JX_STATUS_UNKNOWN {
+		if status.VendorID == model.VendorIDELM {
+			if orderStatus < JX_ORDER_STATUS_WAIT_FOR_DELIVERY {
+				orderStatus = JX_ORDER_STATUS_WAIT_FOR_DELIVERY
+			}
+		}
 		if db == nil {
 			db = orm.NewOrm()
 		}