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-01-21 09:22:45 +08:00
parent c6dbd53320
commit ccf58a9a7c
8 changed files with 146 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxstore/cms/cms.go
View File

@@ -328,7 +328,7 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
db := dao.GetDB() db := dao.GetDB()
switch configType { switch configType {
case model.ConfigTypePricePack: case model.ConfigTypePricePack:
storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key) storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key)
if err = err2; err == nil { if err = err2; err == nil {
var storeInfo []string var storeInfo []string
for _, v := range storeMapList { for _, v := range storeMapList {
@@ -339,7 +339,7 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
} }
} }
case model.ConfigTypeFreightPack: case model.ConfigTypeFreightPack:
storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err2 := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err = err2; err == nil { if err = err2; err == nil {
var storeInfo []string var storeInfo []string
for _, v := range storeMapList { for _, v := range storeMapList {
@@ -419,7 +419,7 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
} }
switch configType { switch configType {
case model.ConfigTypePricePack: case model.ConfigTypePricePack:
storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key) storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key)
if err != nil { if err != nil {
dao.Rollback(db) dao.Rollback(db)
return "", err return "", err
@@ -438,7 +438,7 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
} }
case model.ConfigTypeFreightPack: case model.ConfigTypeFreightPack:
dao.Commit(db) dao.Commit(db)
storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err != nil { if err != nil {
return "", err return "", err
} }

12
business/jxstore/cms/store.go
View File

@@ -398,7 +398,7 @@ func getStoresSql(ctx *jxcontext.Context, keyword string, params map[string]inte
} }
func setStoreMapInfo(ctx *jxcontext.Context, db *dao.DaoDB, storesInfo *StoresInfo, storeIDs []int, briefLevel int) (err error) { func setStoreMapInfo(ctx *jxcontext.Context, db *dao.DaoDB, storesInfo *StoresInfo, storeIDs []int, briefLevel int) (err error) {
storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "") storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
if err != nil { if err != nil {
return err return err
} }
@@ -1661,7 +1661,7 @@ func formalizeStore4Courier(storeDetail *dao.StoreDetail2) *dao.StoreDetail2 {
func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { func ExportShopsHealthInfo(ctx *jxcontext.Context, vendorIDs, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
db := dao.GetDB() db := dao.GetDB()
vendorID := model.VendorIDEBAI vendorID := model.VendorIDEBAI
storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -1749,7 +1749,7 @@ func GetCorporationInfo(ctx *jxcontext.Context, licenceCode string) (corporation
func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs, storeIDs []int) (vendorStoreSnapshotList []*model.VendorStoreSnapshot, err error) { func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs, storeIDs []int) (vendorStoreSnapshotList []*model.VendorStoreSnapshot, err error) {
db := dao.GetDB() db := dao.GetDB()
storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1796,7 +1796,7 @@ func getCurrentSnapshotAt(now time.Time) (snapshotAt time.Time) {
} }
func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.VendorStoreSnapshot) (err error) { func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.VendorStoreSnapshot) (err error) {
storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "") storeMapList, err := dao.GetStoresMapList(db, nil, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
if err != nil { if err != nil {
return err return err
} }
@@ -2380,7 +2380,7 @@ func JdStoreInfoCoordinateRecover(ctx *jxcontext.Context, vendorOrgCode string,
defer file1.Close() defer file1.Close()
db := dao.GetDB() db := dao.GetDB()
storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err == nil { if err == nil {
var validStoreList []*dao.StoreDetail var validStoreList []*dao.StoreDetail
for _, v := range storeList { for _, v := range storeList {
@@ -2645,7 +2645,7 @@ func CreateStorePriceScore(ctx *jxcontext.Context) (err error) {
func RefreshJdLevel(ctx *jxcontext.Context) (err error) { func RefreshJdLevel(ctx *jxcontext.Context) (err error) {
db := dao.GetDB() db := dao.GetDB()
storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, model.StoreStatusOpened, -1, "") storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusOpened, -1, "")
if len(storeMapList) > 0 { if len(storeMapList) > 0 {
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {

82
business/jxstore/cms/store_sku.go
View File

@@ -173,6 +173,9 @@ type tStoreSkusSecKill struct {
VendorID int `orm:"column(vendor_id)"` VendorID int `orm:"column(vendor_id)"`
SecKillCount int SecKillCount int
SecKillCount2 int SecKillCount2 int
OperatorPhone string
MarketManPhone string
NoticeMsg string
} }
const ( const (
@@ -656,7 +659,7 @@ func updateSaleInfo4StoreSkuName(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
} }
func getValidStoreVendorMap(db *dao.DaoDB, storeIDs []int) (realVendorMap map[int]int, err error) { func getValidStoreVendorMap(db *dao.DaoDB, storeIDs []int) (realVendorMap map[int]int, err error) {
storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1982,7 +1985,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
return "", fmt.Errorf("此功能当前只支持京东到家平台") return "", fmt.Errorf("此功能当前只支持京东到家平台")
} }
db := dao.GetDB() db := dao.GetDB()
storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "") storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
if err != nil { if err != nil {
return "", err return "", err
} }
@@ -3354,11 +3357,14 @@ func SendSeckillSkusCountMsg(ctx *jxcontext.Context, vendorIDs []int, isAsync, i
var ( var (
type1Count = 8 type1Count = 8
type2Count = 5 type2Count = 5
ddMsgresult []interface{}
) )
db := dao.GetDB() db := dao.GetDB()
storeList, err := dao.GetStoresMapList(db, vendorIDs, nil, model.StoreStatusOpened, model.StoreIsSyncAll, "") storeList, err := dao.GetStoresMapList(db, vendorIDs, nil, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, model.StoreStatusOpened, model.StoreIsSyncAll, "")
pTask := tasksch.NewParallelTask("SendSeckillSkusCountMsg", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { switch step {
case 0:
taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
store := batchItemList[0].(*model.StoreMap) store := batchItemList[0].(*model.StoreMap)
var type1, type2 int var type1, type2 int
switch store.VendorID { switch store.VendorID {
@@ -3442,24 +3448,60 @@ func SendSeckillSkusCountMsg(ctx *jxcontext.Context, vendorIDs []int, isAsync, i
if type2 < type2Count { if type2 < type2Count {
typeResult += type2Str typeResult += type2Str
} }
noticeMsg := fmt.Sprintf("运营负责人：[%v]，市场负责人：[%v]，门店ID：[%v]，平台门店ID[%v]，门店名：[%v]，平台：[%v]，警告类型：[%v]", operatorName, storeDetail.MarketManName, store.StoreID, storeDetail.VendorStoreID, store.StoreName, model.VendorChineseNames[store.VendorID], typeResult) var result = &tStoreSkusSecKill{}
globals.SugarLogger.Debugf("SendSeckillSkusCountMsg: [%v]", noticeMsg) noticeMsg := fmt.Sprintf("运营负责人：[%v]，市场负责人：[%v]，门店ID：[%v]，平台门店ID[%v]，门店名：[%v]，平台：[%v]，警告类型：[%v]\n", operatorName, storeDetail.MarketManName, store.StoreID, storeDetail.VendorStoreID, store.StoreName, model.VendorChineseNames[store.VendorID], typeResult)
user, err := dao.GetUserByID(db, "mobile", operatorPhone) result.OperatorPhone = operatorPhone
if user != nil && err == nil { result.MarketManPhone = storeDetail.MarketManPhone
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "警告！门店爆品数量异常！", noticeMsg) result.NoticeMsg = noticeMsg
} retVal = []*tStoreSkusSecKill{result}
user2, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone)
if err == nil && user2 != nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user2.UserID, "警告！门店爆品数量异常！", noticeMsg)
}
} }
return retVal, err return retVal, err
}, storeList) }
tasksch.HandleTask(pTask, nil, true).Run() taskParallel := tasksch.NewParallelTask("获取各平台爆品数量", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc, storeList)
if !isAsync { tasksch.HandleTask(taskParallel, task, true).Run()
_, err = pTask.GetResult(0) ddMsgresult, err = taskParallel.GetResult(0)
case 1:
var (
operaterMap = make(map[string]string)
marketMap = make(map[string]string)
)
for _, v := range ddMsgresult {
ddm := v.(*tStoreSkusSecKill)
if operaterMap[ddm.OperatorPhone] != "" {
operaterMap[ddm.OperatorPhone] += ddm.NoticeMsg
} else { } else {
hint = pTask.GetID() operaterMap[ddm.OperatorPhone] = ddm.NoticeMsg
}
if marketMap[ddm.MarketManPhone] != "" {
marketMap[ddm.MarketManPhone] += ddm.NoticeMsg
} else {
marketMap[ddm.MarketManPhone] = ddm.NoticeMsg
}
}
for k, v := range operaterMap {
user, err := dao.GetUserByID(db, "mobile", k)
if user != nil && err == nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "警告！门店爆品数量异常！", v)
}
globals.SugarLogger.Debugf("SendSeckillSkusCountMsg: [%v]", v)
}
for k, v := range marketMap {
user, err := dao.GetUserByID(db, "mobile", k)
if user != nil && err == nil {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "警告！门店爆品数量异常！", v)
}
globals.SugarLogger.Debugf("SendSeckillSkusCountMsg: [%v]", v)
}
}
return result, err
}
taskSeq := tasksch.NewSeqTask2("爆品预警", ctx, isContinueWhenError, taskSeqFunc, 3)
tasksch.HandleTask(taskSeq, nil, true).Run()
if !isAsync {
_, err = taskSeq.GetResult(0)
hint = "1"
} else {
hint = taskSeq.GetID()
} }
return hint, err return hint, err
} }

2
business/jxstore/cms/sync.go
View File

@@ -598,7 +598,7 @@ func (v *VendorSync) AmendAndPruneStoreStuff(ctx *jxcontext.Context, vendorIDs [
func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) { func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) {
var storeMapList []*model.StoreMap var storeMapList []*model.StoreMap
if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, "", mustDirty); err != nil { if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", mustDirty); err != nil {
return nil, "", err return nil, "", err
} }
if len(storeMapList) == 0 { if len(storeMapList) == 0 {

2
business/jxstore/cms/sync_store.go
View File

@@ -16,7 +16,7 @@ func OpenRemoteStoreByJxStatus(ctx *jxcontext.Context, vendorIDs, storeIDs []int
if !isForce { if !isForce {
status = model.StoreStatusClosed status = model.StoreStatusClosed
} }
storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, status, model.StoreIsSyncYes, "") storeMapList, err := dao.GetStoresMapList(db, vendorIDs, storeIDs, nil, status, model.StoreIsSyncYes, "")
if err != nil { if err != nil {
return "", err return "", err
} }

10
business/model/dao/store.go
View File

@@ -211,7 +211,7 @@ func GetStoreCourierList(db *DaoDB, storeIDs []int, status, auditStatus int) (co
return nil, err return nil, err
} }
func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int, pricePack string, mustDirty bool) (storeMapList []*model.StoreMap, err error) { func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack string, mustDirty bool) (storeMapList []*model.StoreMap, err error) {
sql := ` sql := `
SELECT t1.* SELECT t1.*
FROM store_map t1 FROM store_map t1
@@ -230,6 +230,10 @@ func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int,
sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")" sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
sqlParams = append(sqlParams, storeIDs) sqlParams = append(sqlParams, storeIDs)
} }
if len(storeStatuss) > 0 {
sql += " AND t2.status IN (" + GenQuestionMarks(len(storeStatuss)) + ")"
sqlParams = append(sqlParams, storeStatuss)
}
if status != model.StoreStatusAll { if status != model.StoreStatusAll {
sql += " AND t1.status = ?" sql += " AND t1.status = ?"
sqlParams = append(sqlParams, status) sqlParams = append(sqlParams, status)
@@ -252,8 +256,8 @@ func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int,
return nil, err return nil, err
} }
func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int, pricePack string) (storeMapList []*model.StoreMap, err error) { func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs, storeStatuss []int, status, isSync int, pricePack string) (storeMapList []*model.StoreMap, err error) {
return GetStoresMapList2(db, vendorIDs, storeIDs, status, isSync, pricePack, false) return GetStoresMapList2(db, vendorIDs, storeIDs, storeStatuss, status, isSync, pricePack, false)
} }
func StoreMapList2Map(storeMapList []*model.StoreMap) (storeMapMap map[int][]*model.StoreMap) { func StoreMapList2Map(storeMapList []*model.StoreMap) (storeMapMap map[int][]*model.StoreMap) {

2
business/model/dao/store_sku.go
View File

@@ -1254,7 +1254,7 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
vendorIDs = []int{actVendorID} vendorIDs = []int{actVendorID}
} }
} else { } else {
storeMapList, err := GetStoresMapList(db, nil, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "") storeMapList, err := GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
if err != nil { if err != nil {
return err return err
} }

2
business/partner/purchase/mtwm/order_comment.go
View File

@@ -44,7 +44,7 @@ func formalizeTagList(mtwmTagList string) (outTagList string) {
} }
func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) { func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error) {
storeMapList, err2 := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDMTWM}, nil, model.StoreStatusAll, model.StoreIsSyncYes, "") storeMapList, err2 := dao.GetStoresMapList(dao.GetDB(), []int{model.VendorIDMTWM}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
if err = err2; err != nil { if err = err2; err != nil {
return err return err
} }