liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发单定义

Browse Source
This commit is contained in:
邹宗楠
2022-03-16 09:44:58 +08:00
parent db84d51ea7
commit f9fb31c037
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/scheduler/defsch/defsch.go
View File

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

2
business/jxcallback/scheduler/defsch/defsch_ext.go
View File

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

2
business/model/dao/store.go
View File

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

1
business/model/order.go
View File

@@ -163,6 +163,7 @@ type GoodsOrder struct {
// 以下只是用于传递数据 // 以下只是用于传递数据
OriginalData string `orm:"-" json:"-"` OriginalData string `orm:"-" json:"-"`
Skus []*OrderSku `orm:"-" json:"-"` Skus []*OrderSku `orm:"-" json:"-"`
SendOrderType int `orm:"-" json:"-"` // 临时变量发单类型 1-系统手动发单
} }
func (o *GoodsOrder) TableUnique() [][]string { func (o *GoodsOrder) TableUnique() [][]string {