- 强发运单只创建一个

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -13,7 +13,7 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 )
 
-func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, policyHandler partner.CreateWaybillPolicy) (bills []*model.Waybill, err error) {
+func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, policyHandler partner.CreateWaybillPolicy, createOnlyOne bool) (bills []*model.Waybill, err error) {
 	userName := ctx.GetUserName()
 	globals.SugarLogger.Infof("CreateWaybillOnProviders orderID:%s userName:%s", order.VendorOrderID, userName)
 	storeCourierList, err := dao.GetStoreCourierList(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), model.StoreStatusOpened)
@@ -29,6 +29,9 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
 			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)
+				if createOnlyOne {
+					break
+				}
 			} else {
 				globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
 				errList = append(errList, fmt.Sprintf("平台:%s,%s", jxutils.GetVendorName(courierVendorID), err.Error()))

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -85,7 +85,7 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
 		if forceCreate {
 			feeHandler = delivery.NullCreateWaybillPolicy
 		}
-		if bills, err = s.CreateWaybillOnProviders(ctx, order, feeHandler); err == nil {
+		if bills, err = s.CreateWaybillOnProviders(ctx, order, feeHandler, forceCreate); err == nil {
 			if forceCreate {
 				order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled
 				err = partner.CurOrderManager.UpdateOrderStatusAndFlag(order)