发单定义

business/jxcallback/scheduler/defsch/defsch.go

@@ -761,7 +761,7 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
 	}
 
 	// 系统手动发单,不做营业时间校验
-	if storeDetail.SendOrderType == 1 {
+	if savedOrderInfo.order.SendOrderType == 1 {
 		return nil
 	}
 

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -210,8 +210,8 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 			}
 			// 创建可调度对象,并且存储
 			savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
-			savedOrderInfo.storeDetail.SendOrderType = 1 // 设置为手动创建订单
 			if savedOrderInfo != nil {
+				savedOrderInfo.order.SendOrderType = 1 // 设置为手动创建订单
 				order := savedOrderInfo.order
 				if order.DeliveryType == model.OrderDeliveryTypeSelfTake {
 					return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID)

business/model/dao/store.go

@@ -67,8 +67,6 @@ type StoreDetail struct {
 	BrandLogo    string `json:"brandLogo"`
 	BrandIsOpen  int    `json:"brandIsOpen"`
 	BrandIsPrint int    `json:"brandIsPrint"`
-
-	SendOrderType int `orm:"-" json:"-"` // 临时变量发单类型 1-系统手动发单
 }
 
 // 带快递门店信息的

business/model/order.go

@@ -161,8 +161,9 @@ type GoodsOrder struct {
 	NotifyType         int    `json:"notifyType"`                         //0表示没有通知，1表示发的短信，2表示发的语音
 
 	// 以下只是用于传递数据
-	OriginalData string      `orm:"-" json:"-"`
-	Skus         []*OrderSku `orm:"-" json:"-"`
+	OriginalData  string      `orm:"-" json:"-"`
+	Skus          []*OrderSku `orm:"-" json:"-"`
+	SendOrderType int         `orm:"-" json:"-"` // 临时变量发单类型 1-系统手动发单
 }
 
 func (o *GoodsOrder) TableUnique() [][]string {