diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 18dcf3673..342c65ec4 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -304,6 +304,9 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err buildOrderTo102919(order) } } + if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute { + order.BusinessType = model.BusinessTypeImmediate + } return order, err } diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go index e379f5548..e7dd641cd 100644 --- a/business/partner/purchase/jdshop/order.go +++ b/business/partner/purchase/jdshop/order.go @@ -76,7 +76,9 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo } else { if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID { err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成") - // err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) + if status == model.OrderStatusAccepted { + err = p.OrderExport(jxcontext.AdminCtx, order.VendorOrderID, order.VendorOrderID, true) + } } } return err