diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 54bfb0b65..750a63555 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -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) }) } } diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 7e20ff16e..953c57faf 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -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 } diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go index 48af40671..6252f2a3f 100644 --- a/business/jxutils/smsmsg/smsmsg.go +++ b/business/jxutils/smsmsg/smsmsg.go @@ -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