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

骑手已接单通知

Browse Source
This commit is contained in:
suyl
2021-08-27 15:41:54 +08:00
parent d8e9060deb
commit 908d0070e5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
business/jxstore/report/report.go
View File

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