From 229843253d3c87bb166eabb9de90a9b112d2c3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 29 Jul 2023 19:41:55 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 2 +- business/partner/purchase/tao_vegetable/order.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 3fee17ad7..0ac88c8a9 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1516,7 +1516,7 @@ func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error order := savedOrderInfo.order store, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, order.VendorID, "") //flag := (model.IsOrderDeliveryByStore(order) || model.IsOrderDeliveryBySelf(order)) && store.AutoPickup == model.YES - flag := store.AutoPickup == model.YES // 只要打开了就可以自动拣货 + flag := store.AutoPickup == model.YES && store.VendorStatus == model.StoreStatusOpened // 只要打开了就可以自动拣货 if err = s.PickupGoods(order, flag, "autoPickup"); err == nil { order.DeliveryFlag |= model.OrderDeliveryFlagMaskAutoPickup partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag"}) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index a27fede3b..598630bfd 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -539,7 +539,8 @@ func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName s // Swtich2SelfDelivered 订单送达 func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) { - return err + param := OrderStatusChangeDelivery(order, tao_vegetable.OrderStatusDeliveryOver) + return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param) } // SelfDeliverDelivering 自配送订单配送中