From db84d51ea725275ebe1bd6985a739258e82ebe32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 16 Mar 2022 09:36:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch.go | 6 +++--- business/jxcallback/scheduler/defsch/defsch_ext.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 065f6ce9c..346a91d18 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -761,9 +761,9 @@ func (s *DefScheduler) cancelWaybillNotInStoreOpentime(savedOrderInfo *WatchOrde } // 系统手动发单,不做营业时间校验 - //if storeDetail.SendOrderType == 1 { - // return nil - //} + if storeDetail.SendOrderType == 1 { + return nil + } if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 83aeaca4d..c3e3ce4e7 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -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) { savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) if savedOrderInfo != nil { - //savedOrderInfo.storeDetail.SendOrderType = 1 // 设置为手动创建订单 order := savedOrderInfo.order //1表示为门店发单，需要验证门店账户余额情况 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.storeDetail.SendOrderType = 1 // 设置为手动创建订单 if savedOrderInfo != nil { order := savedOrderInfo.order if order.DeliveryType == model.OrderDeliveryTypeSelfTake {