From 5a2e631411c625348cc340c4983f0e92e74b1e7c Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Mon, 30 Aug 2021 09:51:46 +0800
Subject: [PATCH] a

---
 business/jxstore/report/report.go | 2 ++
 business/jxutils/smsmsg/smsmsg.go | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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)