From e9ee68c12d01791d615b884b9ba67ccf634a9068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Jul 2023 16:43:52 +0800 Subject: [PATCH] 1 --- business/partner/purchase/tao_vegetable/order.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index ce806dfc8..fbea60828 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -548,11 +548,22 @@ func (c *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName // SelfDeliverDelivering 自配送订单配送中 func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) { - param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusDelivery) + api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") + // 出库 + param, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusCallRider) if err != nil { return err } - return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param) + if err = api.DeliveryFinish(param); err == nil { + paramDelivery, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusDelivery) + if err != nil { + return err + } + // 开始配送 + return api.DeliveryFinish(paramDelivery) + } + + return err } // SelfDeliverDelivered 自配送订单送达