- add param forceCreate for CreateWaybillOnProviders

- fix error msg bug in BaseScheduler.CreateWaybillOnProviders

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -1,6 +1,8 @@
 package defsch
 
 import (
+	"fmt"
+
 	"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"
@@ -54,3 +56,35 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatusExt(ctx *jxcontext.Context,
 	}, jxutils.ComposeUniversalOrderID(vendorOrderID, vendorID))
 	return err
 }
+
+func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, forceCreate bool) (bills []*model.Waybill, err error) {
+	userName := ctx.GetUserName()
+	globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s userName:%s", vendorOrderID, userName)
+	if vendorID == model.VendorIDELM {
+		return nil, fmt.Errorf("不要直接使用饿了么订单号，请使用相应的饿百订单号")
+	}
+	status := &model.OrderStatus{
+		VendorOrderID: vendorOrderID,
+		VendorID:      vendorID,
+	}
+	savedOrderInfo := s.loadSavedOrderFromMap(status, false)
+	if savedOrderInfo != nil {
+		order := savedOrderInfo.order
+		if forceCreate || (order.LockStatus != model.OrderStatusLocked && order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) {
+			if bills, err = s.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil); err == nil {
+				order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled | model.OrderDeliveryFlagMaskPurcahseDisabled
+				if err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order); err == nil {
+					s.stopTimer(savedOrderInfo)
+					globals.SugarLogger.Debugf("CreateWaybillOnProvidersEx orderID:%s userName:%s successfully", vendorOrderID, userName)
+					return bills, err
+				}
+			}
+		} else {
+			err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
+		}
+	} else {
+		err = scheduler.ErrCanNotFindOrder
+	}
+	globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
+	return bills, err
+}