diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index e5dccbb6f..2726ffef0 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -591,6 +591,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo if order.VendorID == model.VendorIDJDShop { s.solutionJdsOrder(bill) } + //如果是商城的订单, 骑手取货时,需要发短信提醒 + if bill.Status == model.WaybillStatusDelivering && order.VendorID == model.VendorIDJX && order.OrderType == model.OrderTypeNormal { + smsmsg.NotifyJxOrder(order, bill) + } //门店发单的门店,需要根据实际运费更新账户(多退少补) if storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, ""); err2 == nil { if storeDetail.CreateDeliveryType == model.YES { diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index 1659a61e5..b8e19fd60 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -218,3 +218,11 @@ func NotifyNewCourierOrder(bill *model.Waybill) (err error) { }, nil) return err } + +//京西订单配送员取货后,给用户发短信提醒 +func NotifyJxOrder(order *model.GoodsOrder, bill *model.Waybill) (err error) { + err = SendSMSMsg([]string{order.ConsigneeMobile}, globals.SMSSignName, globals.SMSJxOrderDelivering, map[string]interface{}{ + "phone": bill.CourierMobile, + }, order) + return err +} diff --git a/conf/app.conf b/conf/app.conf index 6b23345c1..09104f463 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -139,6 +139,7 @@ smsNewOrderTemplate = "SMS_217235242" smsNewOrderTemplateQ = "SMS_217235240" smsOrderCanceledTemplate = "SMS_175573134" smsNewUserOrderTemplate = "SMS_190284055" +smsJxOrderDelivering = "SMS_217235545" addEvent = true diff --git a/globals/globals.go b/globals/globals.go index bf8ad9f78..b7807393c 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -52,6 +52,7 @@ var ( SMSNewOrderTemplateQ string SMSOrderCanceledTemplate string SMSNewUserOrderTemplate string + SMSJxOrderDelivering string EnableWXAuth2 bool DisableWXAuth1 bool @@ -134,6 +135,7 @@ func Init() { SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "") SMSOrderCanceledTemplate = web.AppConfig.DefaultString("smsOrderCanceledTemplate", "") SMSNewUserOrderTemplate = web.AppConfig.DefaultString("smsNewUserOrderTemplate", "") + SMSJxOrderDelivering = web.AppConfig.DefaultString("smsJxOrderDelivering", "") EnableWXAuth2 = true // web.BConfig.RunMode == "beta" DisableWXAuth1 = true