diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index f11262d97..e379f5548 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -69,14 +69,14 @@ func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI return ChangeOrderStatus(order.VendorOrderID, status, remark) } func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { - status, err := p.GetOrderStatus("", order.VendorOrderID2) + status, err := p.GetOrderStatus(order.VendorOrgCode, order.VendorOrderID2) //说明此时该订单在平台上已经取消了 if status == model.OrderStatusCanceled { err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusCanceled, "订单在京东商城已被取消!") } else { if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID { err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成") - err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) + // err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) } } return err