From 8bdf11d62b317ea1bb033797542750b4c306ce57 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 26 Aug 2021 11:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=9C=A8=E6=8B=A3=E8=B4=A7?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 7 +++++--
 business/jxutils/smsmsg/smsmsg.go              | 7 +++++++
 conf/app.conf                                  | 1 +
 globals/globals.go                             | 2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 14a93fc63..c09601a72 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -398,7 +398,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut
 					}
 					OrderProfitWarning(order)
 					if !isAuto {
-						smsmsg.NotifyNewOrder(order)
+						//smsmsg.NotifyNewOrder(order)
 					}
 					// smsmsg.NotifyNewUserOrder(order)
 					push.NotifyNewOrder(order)
@@ -484,6 +484,9 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 				if statusChanged && status.Status == model.OrderStatusCanceled {
 					s.notifyOrderCanceled(savedOrderInfo.order)
 				}
+				if status.Status == model.OrderStatusFinishedPickup {
+					smsmsg.NotifyPickOrder(order)
+				}
 				msghub.OnFinishedPickup(savedOrderInfo.order)
 			} else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) ||
 				status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) ||
@@ -1573,7 +1576,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) {
 			}
 			OrderProfitWarning(order)
 			if !isAuto {
-				smsmsg.NotifyNewOrder(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 b8e19fd60..8cd758fc9 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -90,6 +90,13 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
 	return err
 }
 
+func NotifyPickOrder(order *model.GoodsOrder) (err error) {
+	if isPushSMS(order) {
+		err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSPickOrderTemplate, nil, order)
+	}
+	return err
+}
+
 func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 	err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSOrderCanceledTemplate, map[string]interface{}{
 		"vendorName": model.VendorChineseNames[order.VendorID],
diff --git a/conf/app.conf b/conf/app.conf
index a18962ad6..a6f88a0a2 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -143,6 +143,7 @@ smsNewOrderTemplateQ = "SMS_218292870"
 smsOrderCanceledTemplate = "SMS_175573134"
 smsNewUserOrderTemplate = "SMS_190284055"
 smsJxOrderDelivering = "SMS_217235545"
+smsPickOrderTemplate = "SMS_222861531"
 
 addEvent = true
 
diff --git a/globals/globals.go b/globals/globals.go
index b7807393c..73d365292 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -53,6 +53,7 @@ var (
 	SMSOrderCanceledTemplate string
 	SMSNewUserOrderTemplate  string
 	SMSJxOrderDelivering     string
+	SMSPickOrderTemplate     string
 
 	EnableWXAuth2  bool
 	DisableWXAuth1 bool
@@ -133,6 +134,7 @@ func Init() {
 	SMSMobileVerifyTemplate = web.AppConfig.DefaultString("smsMobileVerifyTemplate", "")
 	SMSNewOrderTemplate = web.AppConfig.DefaultString("smsNewOrderTemplate", "")
 	SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "")
+	SMSPickOrderTemplate = web.AppConfig.DefaultString("smsPickOrderTemplate", "")
 	SMSOrderCanceledTemplate = web.AppConfig.DefaultString("smsOrderCanceledTemplate", "")
 	SMSNewUserOrderTemplate = web.AppConfig.DefaultString("smsNewUserOrderTemplate", "")
 	SMSJxOrderDelivering = web.AppConfig.DefaultString("smsJxOrderDelivering", "")