From 0381c2a094fff6747d7fa79dbd8bf5dd961cf19c Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Thu, 9 Sep 2021 15:54:53 +0800 Subject: [PATCH] aa --- business/jxcallback/scheduler/defsch/defsch.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index d647f9488..0a978a51a 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -877,11 +877,12 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf if storeDetail.OpenTime1 != 0 && storeDetail.CloseTime1 != 0 { time1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, time.Now()) time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, time.Now()) - if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(30*time.Minute)) > 0 { + if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(time.Minute*30)) > 0 { if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 { + globals.SugarLogger.Debugf("三方运单门店营业时间范围 ：time3 %v ,time4 %v", storeDetail.OpenTime2, storeDetail.CloseTime2) time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now()) time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, time.Now()) - if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(30*time.Minute)) > 0 { + if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(time.Minute*30)) > 0 { err = fmt.Errorf("不在门店营业时间范围内！") } } else { @@ -892,13 +893,13 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf } //1表示为门店发单，需要验证门店账户余额情况 - _, err = s.CheckStoreBalance(jxcontext.AdminCtx, order, waybillVendorIDs) + _, err2 := s.CheckStoreBalance(jxcontext.AdminCtx, order, waybillVendorIDs) //TODO 2021-02-19 增加品牌配送开关 //TODO 2021-08-31 修改为每个平台的开关 //if storeDetail.BrandIsOpen == model.YES { // err = fmt.Errorf("此品牌已关闭配送！ [%v]", storeDetail.BrandName) //} - if err == nil { + if err == nil && err2 == nil { if _, err = s.CreateWaybillOnProviders4SavedOrder(jxcontext.AdminCtx, savedOrderInfo, nil, excludeVendorIDs, false, maxDeliveryFee); err == nil { savedOrderInfo.retryCount++ }