1

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 自配送订单送达