1

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -2,12 +2,13 @@ package defsch
 
 import (
 	"fmt"
-	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"math"
 	"math/rand"
 	"time"
 
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
@@ -287,16 +288,6 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 			return nil, errCode, err
 		}
 	}
-	excludeCourierVendorIDs := make([]int, 0, 0)
-	allDelivery := map[int]int{model.VendorIDFengNiao: 1, model.VendorIDDada: 1, model.VendorIDMTPS: 1, model.VendorIDUUPT: 1, model.VendorIDSFPS: 1}
-	for _, v := range courierVendorIDs {
-		if allDelivery[v] == model.YES {
-			delete(allDelivery, v)
-		}
-	}
-	for k, _ := range allDelivery {
-		excludeCourierVendorIDs = append(excludeCourierVendorIDs, k)
-	}
 
 	billFunc := func() {
 		bills, err = func() (bills []*model.Waybill, err error) {
@@ -322,7 +313,7 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 					order.DeliveryFlag = 0
 					err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
 					// 创建订单
-					if bills, err = s.CreateWaybillOnProviders4SavedOrder(ctx, savedOrderInfo, courierVendorIDs, excludeCourierVendorIDs, forceCreate, maxDeliveryFee); err == nil && len(bills) > 0 {
+					if bills, err = s.CreateWaybillOnProviders4SavedOrder(ctx, savedOrderInfo, courierVendorIDs, nil, forceCreate, maxDeliveryFee); err == nil && len(bills) > 0 {
 						partner.CurOrderManager.OnOrderMsg(order, "手动创建运单成功", fmt.Sprintf("%s创建%s平台运单,强发:%t,最高限价:%d", ctx.GetUserName(), model.VendorChineseNames[bills[0].WaybillVendorID], forceCreate, maxDeliveryFee))
 					}
 				}