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 + }) +}