骑手已接单通知

business/jxcallback/scheduler/defsch/defsch.go

@@ -603,7 +603,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 								s.updateStoreAccount(order, bill)
 							}
 						}
-
+						//针对快送的订单（订单接单后会立马召唤骑手，不会到自动拣货完成）
+						//如果骑手已接单，没有通知过的门店,需要发送通知
+						if bill.Status == model.WaybillStatusAccepted && order.NotifyType == 0 {
+							smsmsg.NotifyPickOrder(order)
+						}
 						//订单已经是结束状态之后来的运单143945553920000001
 						if order.Status > model.OrderStatusEndBegin {
 							s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)

business/jxstore/report/report.go

@@ -822,6 +822,7 @@ func OrderNotifyReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendorI
 		} else {
 			sql += " AND a.order_created_at > ?"
 		}
+		sqlParams = append(sqlParams, fromTime)
 	}
 	if !utils.IsTimeZero(utils.Str2Time(toTime)) {
 		if isFinished {
@@ -829,6 +830,7 @@ func OrderNotifyReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendorI
 		} else {
 			sql += " AND a.order_created_at < ?"
 		}
+		sqlParams = append(sqlParams, toTime)
 	}
 	sql += `
 		LIMIT ? OFFSET ?