- add param forceCreate for CreateWaybillOnProviders

- fix error msg bug in BaseScheduler.CreateWaybillOnProviders

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -15,14 +15,15 @@ import (
 
 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
+	var errList []string
 	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)
+			globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
+			errList = append(errList, err.Error())
 		}
 	}
 	if len(bills) > 0 {
@@ -31,23 +32,6 @@ func (c *BaseScheduler) CreateWaybillOnProviders(order *model.GoodsOrder, userNa
 		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 {
-			bills, err = c.CreateWaybillOnProviders(order, userName, partner.UseableDeliveryVendorIDs, nil)
-		} else {
-			err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation
-		}
-	}
-	globals.SugarLogger.Infof("CreateWaybillOnProvidersEx orderID:%s userName:%s error:%v", vendorOrderID, userName, err)
 	return bills, err
 }
 

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

controllers/jx_order.go

@@ -78,12 +78,13 @@ func (c *OrderController) SelfDelivered() {
 // @Param	token			header		string	true	"认证token"
 // @Param	vendorOrderID	formData	string	true	"订单ID"
 // @Param	vendorID		formData	int		true	"订单所属的厂商ID"
+// @Param	forceCreate		formData	bool	false	"是否强制创建（忽略订单状态检查）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /CreateWaybillOnProviders [post]
 func (c *OrderController) CreateWaybillOnProviders() {
 	c.callCreateWaybillOnProviders(func(params *tOrderCreateWaybillOnProvidersParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, params.Ctx.GetUserName())
+		retVal, err = defsch.FixedScheduler.CreateWaybillOnProvidersEx(params.Ctx, params.VendorOrderID, params.VendorID, params.ForceCreate)
 		return retVal, "", err
 	})
 }