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

a

Browse Source
This commit is contained in:
suyl
2021-08-30 09:51:46 +08:00
parent b0dc0de0d1
commit 5a2e631411
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -838,6 +838,8 @@ func OrderNotifyReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendorI
sqlParams = append(sqlParams, toTime) sqlParams = append(sqlParams, toTime)
} }
sql += ` sql += `
GROUP BY 1, 2
ORDER BY count DESC
LIMIT ? OFFSET ? LIMIT ? OFFSET ?
` `
pageSize = jxutils.FormalizePageSize(pageSize) pageSize = jxutils.FormalizePageSize(pageSize)

2
business/jxutils/smsmsg/smsmsg.go
View File

@@ -125,7 +125,7 @@ func NotifyPickOrder(order *model.GoodsOrder) (err error) {
if store.Tel2 != "" { if store.Tel2 != "" {
mobileList = append(mobileList, store.Tel2) mobileList = append(mobileList, store.Tel2)
} }
if store.SMSNotify != 0 && store.IsOrder == model.NO && store.ID != model.MatterStoreID && store.ID != model.JdShopMainStoreID && len(mobileList) > 0 { if order.NotifyType == 0 && store.SMSNotify != 0 && store.IsOrder == model.NO && store.ID != model.MatterStoreID && store.ID != model.JdShopMainStoreID && len(mobileList) > 0 {
switch store.SMSNotify { switch store.SMSNotify {
case model.NotifyTypeSMS: case model.NotifyTypeSMS:
err = SendSMSMsg(mobileList, globals.SMSSignName, globals.SMSPickOrderTemplate, nil, order) err = SendSMSMsg(mobileList, globals.SMSSignName, globals.SMSPickOrderTemplate, nil, order)