1

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) {

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))
 	}