From 8d5577e58a1651c17e0a6e0aa009b0b7a528e07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 5 Mar 2020 17:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 11 +++++++++++
 controllers/jx_order2.go                      | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index b70f8a3da..96e314583 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -579,12 +579,15 @@ func AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList
 }
 
 func PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
+	globals.SugarLogger.Debugf("orderSolutionForWuLiao1")
 	err = changeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "")
+	globals.SugarLogger.Debugf("orderSolutionForWuLiao2")
 	err = orderSolutionForWuLiao(order)
 	return err
 }
 
 func orderSolutionForWuLiao(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Debugf("orderSolutionForWuLiao3, [%v]", *order)
 	if order.FromStoreID != 0 {
 		// var (
 		// 	goodsNos   []string
@@ -939,3 +942,11 @@ func GetHalfHoursList() (strs []string) {
 	}
 	return strs
 }
+
+func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (err error) {
+	// var (
+	// 	db = dao.GetDB()
+	// )
+
+	return err
+}
diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go
index a60e875dd..c3703abf0 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -160,3 +160,17 @@ func (c *JxOrderController) PayForPopluarMan() {
 		return retVal, "", err
 	})
 }
+
+// @Title 查询物料订单状态
+// @Description 查询物料订单状态
+// @Param	token				header		string	true	"认证token"
+// @Param	vendorOrderID		formData	string	true	"订单ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetMatterOrderStatus [post]
+func (c *JxOrderController) GetMatterOrderStatus() {
+	c.callGetMatterOrderStatus(func(params *tJxorderGetMatterOrderStatusParams) (retVal interface{}, errCode string, err error) {
+		err = localjx.GetMatterOrderStatus(params.Ctx, params.VendorOrderID)
+		return retVal, "", err
+	})
+}