diff --git a/business/jxstore/report/report.go b/business/jxstore/report/report.go index aa3981c98..91b14bce7 100644 --- a/business/jxstore/report/report.go +++ b/business/jxstore/report/report.go @@ -838,6 +838,8 @@ func OrderNotifyReport(ctx *jxcontext.Context, storeIDs, brandIDs []int, vendorI sqlParams = append(sqlParams, toTime) } sql += ` + GROUP BY 1, 2 + ORDER BY count DESC LIMIT ? OFFSET ? ` pageSize = jxutils.FormalizePageSize(pageSize) diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index 4fbf450d1..6cba6b055 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -125,7 +125,7 @@ func NotifyPickOrder(order *model.GoodsOrder) (err error) { if 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 { case model.NotifyTypeSMS: err = SendSMSMsg(mobileList, globals.SMSSignName, globals.SMSPickOrderTemplate, nil, order)