From 2b1dde2931764888d32522ec3a63170b866fa446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 26 Nov 2020 18:22:29 +0800
Subject: [PATCH] try

---
 business/jxcallback/scheduler/defsch/defsch.go | 10 ++++------
 business/jxutils/smsmsg/smsmsg.go              | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 945c9fd16..541b64328 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -391,7 +391,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
 					}
 					OrderProfitWarning(order)
 					smsmsg.NotifyNewOrder(order)
-					smsmsg.NotifyNewUserOrder(order)
+					// smsmsg.NotifyNewUserOrder(order)
 					push.NotifyNewOrder(order)
 				})
 			}
@@ -555,7 +555,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				s.resetTimer(savedOrderInfo, bill, isPending)
 				s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
 			}
-			s.sendCourierOrderSMS(bill)
+			// s.sendCourierOrderSMS(bill)
 		} else {
 			isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
 			if !isBillExist {
@@ -1514,10 +1514,8 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 				weixinmsg.NotifyNewOrder(order)
 			}
 			OrderProfitWarning(order)
-			if order.VendorID != model.VendorIDJDShop {
-				smsmsg.NotifyNewOrder(order)
-				smsmsg.NotifyNewUserOrder(order)
-			}
+			smsmsg.NotifyNewOrder(order)
+			// smsmsg.NotifyNewUserOrder(order)
 			push.NotifyNewOrder(order)
 		})
 	}
diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index f434bf47a..c9408cb6d 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -24,7 +24,6 @@ var (
 )
 
 func SendSMSMsg(mobileList []string, signName, templateCode string, templateParam map[string]interface{}, order *model.GoodsOrder) (err error) {
-	return err
 	if len(mobileList) > 0 {
 		errList := errlist.New()
 		mobileList = jxutils.StringMap2List(jxutils.StringList2Map(mobileList))
@@ -43,11 +42,12 @@ func SendSMSMsg(mobileList []string, signName, templateCode string, templatePara
 						} else {
 							globals.SugarLogger.Infof(errMsg)
 						}
-					} else {
-						if order != nil {
-							err = updateStoreSMSNotifyMark(order)
-						}
 					}
+					// else {
+					// 	if order != nil {
+					// 		err = updateStoreSMSNotifyMark(order)
+					// 	}
+					// }
 				}
 			}
 		}
@@ -90,7 +90,7 @@ func isPushSMS(order *model.GoodsOrder) bool {
 	stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
 	if len(stores) > 0 {
 		if stores[0].IsOrder == model.NO {
-			if storeID == model.MatterStoreID {
+			if storeID == model.MatterStoreID || storeID == model.JdShopMainStoreID || storeID == model.JdShopMainStoreID2 {
 				return false
 			} else {
 				return true