From 908d0070e54670a1e0e0ca26567651bdff9c3a43 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Fri, 27 Aug 2021 15:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E6=89=8B=E5=B7=B2=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 6 +++++-
 business/jxstore/report/report.go              | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 355137272..d3dd75161 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/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)
diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go
index 1d1d07034..a88e573d1 100644
--- a/business/jxstore/report/report.go
+++ b/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 ?