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

try

Browse Source
This commit is contained in:
苏尹岚
2020-11-26 18:22:29 +08:00
parent 90efd04463
commit 2b1dde2931
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,7 +391,7 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
} }
OrderProfitWarning(order) OrderProfitWarning(order)
smsmsg.NotifyNewOrder(order) smsmsg.NotifyNewOrder(order)
smsmsg.NotifyNewUserOrder(order) // smsmsg.NotifyNewUserOrder(order)
push.NotifyNewOrder(order) push.NotifyNewOrder(order)
}) })
} }
@@ -555,7 +555,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.resetTimer(savedOrderInfo, bill, isPending) s.resetTimer(savedOrderInfo, bill, isPending)
s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime) s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
} }
s.sendCourierOrderSMS(bill) // s.sendCourierOrderSMS(bill)
} else { } else {
isBillExist := s.updateBillsInfo(savedOrderInfo, bill) isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
if !isBillExist { if !isBillExist {
@@ -1514,10 +1514,8 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
weixinmsg.NotifyNewOrder(order) weixinmsg.NotifyNewOrder(order)
} }
OrderProfitWarning(order) OrderProfitWarning(order)
if order.VendorID != model.VendorIDJDShop { smsmsg.NotifyNewOrder(order)
smsmsg.NotifyNewOrder(order) // smsmsg.NotifyNewUserOrder(order)
smsmsg.NotifyNewUserOrder(order)
}
push.NotifyNewOrder(order) push.NotifyNewOrder(order)
}) })
} }

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

@@ -24,7 +24,6 @@ var (
) )
func SendSMSMsg(mobileList []string, signName, templateCode string, templateParam map[string]interface{}, order *model.GoodsOrder) (err error) { func SendSMSMsg(mobileList []string, signName, templateCode string, templateParam map[string]interface{}, order *model.GoodsOrder) (err error) {
return err
if len(mobileList) > 0 { if len(mobileList) > 0 {
errList := errlist.New() errList := errlist.New()
mobileList = jxutils.StringMap2List(jxutils.StringList2Map(mobileList)) mobileList = jxutils.StringMap2List(jxutils.StringList2Map(mobileList))
@@ -43,11 +42,12 @@ func SendSMSMsg(mobileList []string, signName, templateCode string, templatePara
} else { } else {
globals.SugarLogger.Infof(errMsg) 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, "", "") stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
if len(stores) > 0 { if len(stores) > 0 {
if stores[0].IsOrder == model.NO { if stores[0].IsOrder == model.NO {
if storeID == model.MatterStoreID { if storeID == model.MatterStoreID || storeID == model.JdShopMainStoreID || storeID == model.JdShopMainStoreID2 {
return false return false
} else { } else {
return true return true