aa

business/jxcallback/scheduler/basesch/basesch.go

@@ -1,6 +1,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"
@@ -164,16 +165,21 @@ func (c *BaseScheduler) CreateWaybill(platformVendorID int, order *model.GoodsOr
 	// 		return nil, fmt.Errorf("转商家自送的订单只允许有一个有效运单，当前已经有%s运单", jxutils.GetVendorName(waybillList[0].WaybillVendorID))
 	// 	}
 	// }
+	storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode)
 	handlerInfo := partner.GetDeliveryPlatformFromVendorID(platformVendorID)
 	if handlerInfo != nil && handlerInfo.Use4CreateWaybill {
-		if c.IsReallyCallPlatformAPI {
-			bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
-			if err != nil {
-				globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
-			} else {
-				order.DeliveryFlag |= model.WaybillVendorID2Mask(platformVendorID)
-				err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
+		if model.DeliveryBrandMarkMap[platformVendorID]&storeDetail.BrandIsOpen != 0 {
+			if c.IsReallyCallPlatformAPI {
+				bill, err = handlerInfo.Handler.CreateWaybill(order, maxDeliveryFee)
+				if err != nil {
+					globals.SugarLogger.Infof("CreateWaybill failed orderID:%s vendorID:%d with error:%v", order.VendorOrderID, platformVendorID, err)
+				} else {
+					order.DeliveryFlag |= model.WaybillVendorID2Mask(platformVendorID)
+					err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
+				}
 			}
+		} else {
+			err = fmt.Errorf("CreateWaybill failed brand is close orderID: %s, isOpen: %d", order.VendorOrderID, storeDetail.BrandIsOpen)
 		}
 	} else {
 		err = scheduler.ErrDeliverProviderWrong