a
This commit is contained in:
@@ -591,6 +591,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
|
|||||||
if order.VendorID == model.VendorIDJDShop {
|
if order.VendorID == model.VendorIDJDShop {
|
||||||
s.solutionJdsOrder(bill)
|
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, err2 := dao.GetStoreDetail(dao.GetDB(), jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, ""); err2 == nil {
|
||||||
if storeDetail.CreateDeliveryType == model.YES {
|
if storeDetail.CreateDeliveryType == model.YES {
|
||||||
|
|||||||
@@ -218,3 +218,11 @@ func NotifyNewCourierOrder(bill *model.Waybill) (err error) {
|
|||||||
}, nil)
|
}, nil)
|
||||||
return err
|
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
|
||||||
|
}
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ smsNewOrderTemplate = "SMS_217235242"
|
|||||||
smsNewOrderTemplateQ = "SMS_217235240"
|
smsNewOrderTemplateQ = "SMS_217235240"
|
||||||
smsOrderCanceledTemplate = "SMS_175573134"
|
smsOrderCanceledTemplate = "SMS_175573134"
|
||||||
smsNewUserOrderTemplate = "SMS_190284055"
|
smsNewUserOrderTemplate = "SMS_190284055"
|
||||||
|
smsJxOrderDelivering = "SMS_217235545"
|
||||||
|
|
||||||
addEvent = true
|
addEvent = true
|
||||||
|
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ var (
|
|||||||
SMSNewOrderTemplateQ string
|
SMSNewOrderTemplateQ string
|
||||||
SMSOrderCanceledTemplate string
|
SMSOrderCanceledTemplate string
|
||||||
SMSNewUserOrderTemplate string
|
SMSNewUserOrderTemplate string
|
||||||
|
SMSJxOrderDelivering string
|
||||||
|
|
||||||
EnableWXAuth2 bool
|
EnableWXAuth2 bool
|
||||||
DisableWXAuth1 bool
|
DisableWXAuth1 bool
|
||||||
@@ -134,6 +135,7 @@ func Init() {
|
|||||||
SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "")
|
SMSNewOrderTemplateQ = web.AppConfig.DefaultString("smsNewOrderTemplateQ", "")
|
||||||
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", "")
|
||||||
|
|
||||||
EnableWXAuth2 = true // web.BConfig.RunMode == "beta"
|
EnableWXAuth2 = true // web.BConfig.RunMode == "beta"
|
||||||
DisableWXAuth1 = true
|
DisableWXAuth1 = true
|
||||||
|
|||||||
Reference in New Issue
Block a user