liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-28 10:23:32 +08:00
parent 3458c82cea
commit 15601e9d58
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/partner/purchase/jdshop/callback.go
View File

@@ -304,6 +304,9 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
buildOrderTo102919(order) buildOrderTo102919(order)
} }
} }
if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute {
order.BusinessType = model.BusinessTypeImmediate
}
return order, err return order, err
} }

4
business/partner/purchase/jdshop/order.go
View File

@@ -76,7 +76,9 @@ func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
} else { } else {
if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID { if jxutils.GetSaleStoreIDFromOrder(order) != model.JdShopMainStoreID {
err = ChangeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "自动拣货完成") 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 return err