- 处理小费时，对于定时达特殊处理

business/jxcallback/scheduler/defsch/defsch.go

@@ -977,6 +977,11 @@ func (s *DefScheduler) autoPickupGood(savedOrderInfo *WatchOrderInfo) (err error
 
 func (s *DefScheduler) getWaybillTip(order *model.GoodsOrder) (tipFee int64) {
 	if order.Status == model.OrderStatusFinishedPickup {
+		statusTime := order.StatusTime
+		if order.BusinessType != model.BusinessTypeImmediate {
+			statusTime = order.PickDeadline
+		}
+		if !utils.IsTimeZero(statusTime) {
 			startTime := order.StatusTime.Add(minAddWaybillTipMinute * time.Minute)
 			if order.DeliveryFlag&model.OrderDeliveryFlagMaskAutoPickup != 0 {
 				startTime = startTime.Add(5 * time.Minute)
@@ -990,6 +995,7 @@ func (s *DefScheduler) getWaybillTip(order *model.GoodsOrder) (tipFee int64) {
 				}
 			}
 		}
+	}
 	return tipFee
 }