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

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-07 11:51:51 +08:00
parent 95b52c3d57
commit 224d96254b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -933,11 +933,11 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf
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())
time2 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, 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 { if storeDetail.OpenTime2 != 0 && storeDetail.CloseTime2 != 0 {
time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now()) time3 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime2, time.Now())
time4 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime2, 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("不在门店营业时间范围内！") err = fmt.Errorf("不在门店营业时间范围内！")
} }
} else { } else {

1
business/partner/delivery/rider.go
View File

@@ -88,7 +88,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
riderInfo.LogisticsProviderCode = "10017" riderInfo.LogisticsProviderCode = "10017"
} }
riderInfo.ThirdCarrierOrderId = v.VendorWaybillID
switch riderInfo.LogisticsStatus { switch riderInfo.LogisticsStatus {
case 5: // 呼叫骑手 case 5: // 呼叫骑手
riderInfo.LogisticsStatus = 0 riderInfo.LogisticsStatus = 0