From 224d96254b06adabf0be8cb872cbd501ecf26e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 11:51:51 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 4 ++-- business/partner/delivery/rider.go | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index a03058ede..933067c63 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -933,11 +933,11 @@ 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(time.Minute*30)) > 0 { + if time.Now().Sub(time1) < 0 || time.Now().Sub(time2.Add(time.Minute*120)) > 0 { if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 { 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(time.Minute*30)) > 0 { + if time.Now().Sub(time3) < 0 || time.Now().Sub(time4.Add(time.Minute*120)) > 0 { err = fmt.Errorf("不在门店营业时间范围内！") } } else { diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index c28c970eb..ea835d2e1 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -88,7 +88,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { riderInfo.LogisticsProviderCode = "10017" } - riderInfo.ThirdCarrierOrderId = v.VendorWaybillID switch riderInfo.LogisticsStatus { case 5: // 呼叫骑手 riderInfo.LogisticsStatus = 0