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:36:49 +08:00
parent 312a563d5e
commit db84d51ea7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -761,9 +761,9 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde
} }
// 系统手动发单,不做营业时间校验 // 系统手动发单,不做营业时间校验
//if storeDetail.SendOrderType == 1 { if storeDetail.SendOrderType == 1 {
// return nil return nil
//} }
if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 {
time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now())

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

@@ -194,7 +194,6 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex
func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, courierVendorIDs []int, forceCreate bool, maxDeliveryFee int64) (bills []*model.Waybill, errCode string, err error) { func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendorOrderID string, vendorID int, courierVendorIDs []int, forceCreate bool, maxDeliveryFee int64) (bills []*model.Waybill, errCode string, err error) {
savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true)
if savedOrderInfo != nil { if savedOrderInfo != nil {
//savedOrderInfo.storeDetail.SendOrderType = 1 // 设置为手动创建订单
order := savedOrderInfo.order order := savedOrderInfo.order
//1表示为门店发单，需要验证门店账户余额情况 //1表示为门店发单，需要验证门店账户余额情况
if errCode, err = s.CheckStoreBalance(ctx, order, courierVendorIDs); err != nil { if errCode, err = s.CheckStoreBalance(ctx, order, courierVendorIDs); err != nil {
@@ -211,6 +210,7 @@ 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 {
order := savedOrderInfo.order order := savedOrderInfo.order
if order.DeliveryType == model.OrderDeliveryTypeSelfTake { if order.DeliveryType == model.OrderDeliveryTypeSelfTake {