From 15601e9d58a9201864a3f55d467acd5e8bedf7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 28 Dec 2020 10:23:32 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jdshop/callback.go | 3 +++
 business/partner/purchase/jdshop/order.go    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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