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

发短信开着

Browse Source
This commit is contained in:
苏尹岚
2020-05-19 17:14:38 +08:00
parent fd8aee31ba
commit 916e71bae7
3 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,7 +516,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.resetTimer(savedOrderInfo, bill, isPending)
s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
}
// s.sendCourierOrderSMS(bill)
s.sendCourierOrderSMS(bill)
} else {
isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
if !isBillExist {
@@ -1361,7 +1361,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
weixinmsg.NotifyNewOrder(order)
smsmsg.NotifyNewOrder(order)
OrderProfitWarning(order)
// smsmsg.NotifyNewUserOrder(order)
smsmsg.NotifyNewUserOrder(order)
})
}
}

24
business/jxstore/cms/sku.go
View File

@@ -1120,11 +1120,25 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
err = ErrEntityNotExist
}
}
storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
if len(storeSkus) > 0 {
skuBindInfos := []*StoreSkuBindInfo{}
FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
}
// storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
// if len(storeSkus) > 0 {
// storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, nil, nameID)
// err = err2
// skuBindInfos := []*StoreSkuBindInfo{}
// for _, v := range storeSkus2 {
// skus2 := []*StoreSkuBindSkuInfo{}
// skuBindInfo := &StoreSkuBindInfo{
// StoreID: v.StoreID,
// }
// sku2 := &StoreSkuBindSkuInfo{
// SkuID: sku.ID,
// }
// skus2 = append(skus2, sku2)
// skuBindInfo.Skus = skus2
// skuBindInfos = append(skuBindInfos, skuBindInfo)
// }
// FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
// }
return outSkuNameExt, err
}

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

@@ -115,39 +115,26 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
} else {
storeID = order.StoreID
}
if order.ConsigneeMobile2 == "" {
mobile = order.ConsigneeMobile
} else {
if order.ConsigneeMobile2 != "" {
mobile = order.ConsigneeMobile2
}
uoSMS, err := dao.GetUserOrderSMS(db, mobile, "")
stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
if len(stores) > 0 {
if stores[0].Tel1 == "" {
storeTel = stores[0].Tel2
} else {
storeTel = stores[0].Tel1
uoSMS, err := dao.GetUserOrderSMS(db, mobile, "")
stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
if len(stores) > 0 {
if stores[0].Tel1 == "" {
storeTel = stores[0].Tel2
} else {
storeTel = stores[0].Tel1
}
}
}
if uoSMS == nil {
uoSMSc := &model.UserOrderSms{
Mobile: mobile,
Name: order.ConsigneeName,
VendorUserID: order.VendorUserID,
TotalCount: 0,
SMSMark: model.NO,
}
err = dao.CreateEntity(db, uoSMSc)
err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
"tel": storeTel,
}, nil)
if err == nil {
uoSMS.SMSMark = model.YES
uoSMS.TotalCount++
_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
}
} else {
if uoSMS.SMSMark != model.YES {
if uoSMS == nil {
uoSMSc := &model.UserOrderSms{
Mobile: mobile,
Name: order.ConsigneeName,
VendorUserID: order.VendorUserID,
TotalCount: 0,
SMSMark: model.NO,
}
err = dao.CreateEntity(db, uoSMSc)
err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
"tel": storeTel,
}, nil)
@@ -156,6 +143,17 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
uoSMS.TotalCount++
_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
}
} else {
if uoSMS.SMSMark != model.YES {
err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
"tel": storeTel,
}, nil)
if err == nil {
uoSMS.SMSMark = model.YES
uoSMS.TotalCount++
_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
}
}
}
}
return err