From 2f41887ff60d09f24b9eec59385d6e9d3056179e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 22 Jan 2024 18:13:02 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch_ext.go | 5 +++-- business/partner/purchase/mtwm/order.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 411153ad6..6d13210a0 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -294,9 +294,10 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor delete(allDelivery, v) } } - for _, v := range allDelivery { - excludeCourierVendorIDs = append(excludeCourierVendorIDs, v) + for k, _ := range allDelivery { + excludeCourierVendorIDs = append(excludeCourierVendorIDs, k) } + globals.SugarLogger.Debugf("===========") billFunc := func() { bills, err = func() (bills []*model.Waybill, err error) { diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index fd4361c03..c7218bed6 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -554,6 +554,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo //PeiSongTypeKuaiDi = "2002" // 快送 //PeiSongTypeWholeCity = "2010" // 全城送 //PeiSongTypeMixed = "3001" // 混合送（即美团专送+快送） + //PeiSongTypeMixedExpressQiKe = "30012002" // 混合送（混合快送） if isSelfDelivery { err = api.PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) }