Merge remote-tracking branch 'origin/mark' into yonghui

business/partner/purchase/jx/order.go

@@ -16,9 +16,18 @@ func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 }
 
 func (c *PurchaseHandler) GetOrder(vendorOrgCode, orderID string) (order *model.GoodsOrder, err error) {
+	order, err = partner.CurOrderManager.LoadOrder(orderID, model.VendorIDJX)
 	return order, err
 }
 
+func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
+	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDJX)
+	if err == nil {
+		status = order.Status
+	}
+	return status, err
+}
+
 func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
 	var status int
 	if isAcceptIt {