diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 30b82be12..9ba3a190b 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -811,10 +811,12 @@ func (s *DefScheduler) createWaybillOn3rdProviders(savedOrderInfo *WatchOrderInf var fee int64 handler := partner.GetDeliveryPlatformFromVendorID(vendorID) if deliveryFeeInfo, err := handler.Handler.GetWaybillFee(order); err == nil { - if income-deliveryFeeInfo.DeliveryFee <= 0 { - excludeVendorIDs = append(excludeVendorIDs, vendorID) + if deliveryFeeInfo != nil { + if income-deliveryFeeInfo.DeliveryFee <= 0 { + excludeVendorIDs = append(excludeVendorIDs, vendorID) + } + fee = deliveryFeeInfo.DeliveryFee } - fee = deliveryFeeInfo.DeliveryFee } globals.SugarLogger.Debugf("count order income, vendorID: %v, income :%v , deliveryFee : %v", vendorID, income, fee) } @@ -831,11 +833,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.Hour)) > 0 { + if time.Now().Sub(time1) < 0 || time.Now().Sub(time2) > 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.Hour)) > 0 { + if time.Now().Sub(time3) < 0 || time.Now().Sub(time4) > 0 { err = fmt.Errorf("不在门店营业时间范围内!") } } else {