- CreateWaybillOnProvidersEx use all possible courier vendor(not just MTPS).

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -3,6 +3,7 @@ package basesch
 import (
 	"fmt"
 
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -12,26 +13,41 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 )
 
-func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) {
-	globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", vendorOrderID, userName)
+func (c *BaseScheduler) CreateWaybillOnProviders(order *model.GoodsOrder, userName string, courierVendorIDs []int, policyHandler func(deliveryFee, addFee int64) error) (bills []*model.Waybill, err error) {
+	globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", order.VendorOrderID, userName)
+	var errList []error
+	for _, courierVendorID := range courierVendorIDs {
+		bill, err2 := c.CreateWaybill(courierVendorID, order, policyHandler)
+		if err = err2; err == nil {
+			globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d bill:%v", order.VendorOrderID, userName, courierVendorID, bill)
+			bills = append(bills, bill)
+		} else {
+			errList = append(errList, err)
+		}
+	}
+	if len(bills) > 0 {
+		err = nil
+	} else {
+		err = fmt.Errorf("所有运单失败：\n%s", utils.Format4Output(errList, false))
+	}
+	globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", order.VendorOrderID, userName, err)
+	return nil, err
+}
+
+func (c *BaseScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, userName string) (bills []*model.Waybill, err error) {
+	globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s", vendorOrderID, userName)
 	if vendorID == model.VendorIDELM {
 		return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号")
 	}
 	order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
 	if err == nil {
 		if order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin {
-			bill, err2 := c.CreateWaybill(model.VendorIDMTPS, order, nil)
-			if err = err2; err == nil {
-				globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s bill:%v", vendorOrderID, userName, bill)
-				return []*model.Waybill{
-					bill,
-				}, nil
-			}
+			c.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil)
 		} else {
 			err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
 		}
 	}
-	globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
+	globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 	return nil, err
 }
 

business/jxcallback/scheduler/defsch/defsch.go

@@ -445,9 +445,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 							bill.WaybillVendorID = model.VendorIDUnknown
 							s.updateOrderByBill(order, bill, false)
 						}
-						// 3方的运单取消才会重新发起创建3方订单，购物平台的运单取消后，它本身还会再创建新运单(NewWabill事件有相应TIMER))，至少京东是这样的，暂时按京东的行为来
+						// 3方的运单取消才会重新发起创建3方订单，购物平台的运单取消后，它本身还会再创建新运单(NewWaybill事件有相应TIMER))，至少京东是这样的，暂时按京东的行为来
 						// 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单
-						if order.Status < model.OrderStatusDelivering && (bill.WaybillVendorID != order.VendorID || order.VendorID == model.VendorIDEBAI) {
+						// 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以
+						if order.Status < model.OrderStatusEndBegin && (bill.WaybillVendorID != order.VendorID || order.VendorID == model.VendorIDEBAI) {
 							s.createWaybillOn3rdProviders(savedOrderInfo, nil)
 						}
 					}

business/partner/partner.go

@@ -38,6 +38,7 @@ var (
 
 	PurchasePlatformHandlers map[int]IPurchasePlatformHandler
 	DeliveryPlatformHandlers map[int]*DeliveryPlatformHandlerInfo
+	UseableDeliveryVendorIDs []int
 )
 
 type IOrderManager interface {
@@ -172,6 +173,7 @@ func RegisterDeliveryPlatform(handler IDeliveryPlatformHandler, isUse4CreateWayb
 		Handler:           handler,
 		Use4CreateWaybill: isUse4CreateWaybill,
 	}
+	UseableDeliveryVendorIDs = append(UseableDeliveryVendorIDs, vendorID)
 }
 func GetPurchasePlatformFromVendorID(vendorID int) IPurchasePlatformHandler {
 	return PurchasePlatformHandlers[vendorID]

controllers/jx_order.go

@@ -83,7 +83,7 @@ func (c *OrderController) SelfDelivered() {
 // @router /CreateWaybillOnProviders [post]
 func (c *OrderController) CreateWaybillOnProviders() {
 	c.callCreateWaybillOnProviders(func(params *tOrderCreateWaybillOnProvidersParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = defsch.FixedScheduler.CreateWaybillOnProviders(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
+		retVal, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
 		return retVal, "", err
 	})
 }