添加淘鲜达

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -27,7 +27,7 @@ const (
 )
 
 func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *model.GoodsOrder, courierVendorIDs, excludeCourierVendorIDs []int, maxDeliveryFee int64, createOnlyOne bool) (bills []*model.Waybill, err error) {
-	storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
+	storeCourierList, err := dao.GetStoreCourierList2(dao.GetDB(), []int{jxutils.GetSaleStoreIDFromOrder(order)}, courierVendorIDs, model.StoreStatusOpened, []int{model.StoreAuditStatusOnline, model.StoreAuditStatusUpdated})
 	if err != nil {
 		return nil, err
 	}

business/jxcallback/scheduler/defsch/defsch.go

@@ -944,6 +944,7 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
 
 				//1表示为门店发单，需要验证门店账户余额情况
 				_, err2 := s.CheckStoreBalance(jxcontext.AdminCtx, order, waybillVendorIDs)
+				// 检查是否有有效运单
 				if err == nil && err2 == nil {
 					// 1.检查门店三方配送配置,达达>蜂鸟>美团>顺丰>uu
 					// excludeVendorIDs 包括上面已经发送的平台id

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -42,8 +42,8 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 								if err = err2; err == nil {
 									phone = storeDetail.Tel1
 								}
-								err = s.SelfDeliverDelivering(order, phone) // 取消平台自配送
-								//s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度
+								err = s.SelfDeliverDelivering(order, phone)                // 取消平台自配送
+								s.CancelAll3rdWaybills(ctx, vendorOrderID, vendorID, true) // 取消三方平台配送以及调度
 							}
 						} else {
 							if order.Status < model.OrderStatusDelivering {
@@ -159,6 +159,14 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
 	if !forceCreate {
 		err = s.canOrderCreateWaybillNormally(order, nil)
 	}
+	// 检查订单是否在配送状态
+	waybills, err := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil)
+	for _, v := range waybills {
+		if v.Status >= model.OrderStatusDelivering {
+			err = fmt.Errorf("订单已经在配送中,无法创建运单,有疑问请联系管理员")
+			break
+		}
+	}
 	if err == nil {
 		if forceCreate {
 			maxDeliveryFee = math.MaxInt64