From f9fb31c037eb57709ea1de18bf4ddda4daeba344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 16 Mar 2022 09:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8D=95=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go     | 2 +-
 business/jxcallback/scheduler/defsch/defsch_ext.go | 2 +-
 business/model/dao/store.go                        | 2 --
 business/model/order.go                            | 5 +++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 346a91d18..5c5b4fcee 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/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
 	}
 
diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go
index c3e3ce4e7..f367417d6 100644
--- a/business/jxcallback/scheduler/defsch/defsch_ext.go
+++ b/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)
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 715b31531..27119cd39 100644
--- a/business/model/dao/store.go
+++ b/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-系统手动发单
 }
 
 // 带快递门店信息的
diff --git a/business/model/order.go b/business/model/order.go
index 77b737b9c..def9f8bbc 100644
--- a/business/model/order.go
+++ b/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 {