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

短信在拣货完成后发送

Browse Source
This commit is contained in:
suyl
2021-08-26 11:50:37 +08:00
parent 5faebdf3f0
commit 8bdf11d62b
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -398,7 +398,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut
} }
OrderProfitWarning(order) OrderProfitWarning(order)
if !isAuto { if !isAuto {
smsmsg.NotifyNewOrder(order) //smsmsg.NotifyNewOrder(order)
} }
// smsmsg.NotifyNewUserOrder(order) // smsmsg.NotifyNewUserOrder(order)
push.NotifyNewOrder(order) push.NotifyNewOrder(order)
@@ -484,6 +484,9 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
if statusChanged && status.Status == model.OrderStatusCanceled { if statusChanged && status.Status == model.OrderStatusCanceled {
s.notifyOrderCanceled(savedOrderInfo.order) s.notifyOrderCanceled(savedOrderInfo.order)
} }
if status.Status == model.OrderStatusFinishedPickup {
smsmsg.NotifyPickOrder(order)
}
msghub.OnFinishedPickup(savedOrderInfo.order) msghub.OnFinishedPickup(savedOrderInfo.order)
} else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) || } else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) ||
status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(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) OrderProfitWarning(order)
if !isAuto { if !isAuto {
smsmsg.NotifyNewOrder(order) //smsmsg.NotifyNewOrder(order)
} }
// smsmsg.NotifyNewUserOrder(order) // smsmsg.NotifyNewUserOrder(order)
push.NotifyNewOrder(order) push.NotifyNewOrder(order)

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

@@ -90,6 +90,13 @@ func NotifyNewOrder(order *model.GoodsOrder) (err error) {
return err 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) { func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSOrderCanceledTemplate, map[string]interface{}{ err = SendSMSMsg(getOrderNotifyPhone(order), globals.SMSSignName, globals.SMSOrderCanceledTemplate, map[string]interface{}{
"vendorName": model.VendorChineseNames[order.VendorID], "vendorName": model.VendorChineseNames[order.VendorID],

1
conf/app.conf
View File

@@ -143,6 +143,7 @@ smsNewOrderTemplateQ = "SMS_218292870"
smsOrderCanceledTemplate = "SMS_175573134" smsOrderCanceledTemplate = "SMS_175573134"
smsNewUserOrderTemplate = "SMS_190284055" smsNewUserOrderTemplate = "SMS_190284055"
smsJxOrderDelivering = "SMS_217235545" smsJxOrderDelivering = "SMS_217235545"
smsPickOrderTemplate = "SMS_222861531"
addEvent = true addEvent = true

2
globals/globals.go
View File

@@ -53,6 +53,7 @@ var (
SMSOrderCanceledTemplate string SMSOrderCanceledTemplate string
SMSNewUserOrderTemplate string SMSNewUserOrderTemplate string
SMSJxOrderDelivering string SMSJxOrderDelivering string
SMSPickOrderTemplate string
EnableWXAuth2 bool EnableWXAuth2 bool
DisableWXAuth1 bool DisableWXAuth1 bool
@@ -133,6 +134,7 @@ func Init() {
SMSMobileVerifyTemplate = web.AppConfig.DefaultString("smsMobileVerifyTemplate", "") SMSMobileVerifyTemplate = web.AppConfig.DefaultString("smsMobileVerifyTemplate", "")
SMSNewOrderTemplate = web.AppConfig.DefaultString("smsNewOrderTemplate", "") SMSNewOrderTemplate = web.AppConfig.DefaultString("smsNewOrderTemplate", "")
SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "") SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "")
SMSPickOrderTemplate = web.AppConfig.DefaultString("smsPickOrderTemplate", "")
SMSOrderCanceledTemplate = web.AppConfig.DefaultString("smsOrderCanceledTemplate", "") SMSOrderCanceledTemplate = web.AppConfig.DefaultString("smsOrderCanceledTemplate", "")
SMSNewUserOrderTemplate = web.AppConfig.DefaultString("smsNewUserOrderTemplate", "") SMSNewUserOrderTemplate = web.AppConfig.DefaultString("smsNewUserOrderTemplate", "")
SMSJxOrderDelivering = web.AppConfig.DefaultString("smsJxOrderDelivering", "") SMSJxOrderDelivering = web.AppConfig.DefaultString("smsJxOrderDelivering", "")