diff --git a/business/jxstore/misc/store_score.go b/business/jxstore/misc/store_score.go index e52e0c4e9..1c613526c 100644 --- a/business/jxstore/misc/store_score.go +++ b/business/jxstore/misc/store_score.go @@ -43,6 +43,8 @@ const ( StoreRangeBadRadius = 1.0 //千米 SaleSkuPriceRatio = 90 //千米 SaleSkuCheckRange = 5.0 //千米 + + WeekNum = 5 //得到门店近期周的数量 ) var ( @@ -710,23 +712,23 @@ func Time2Week(t time.Time) int { } func SplitToSingleWeekDataList(storeScoreList []*model.StoreScoreEx) (weekDataList [][]*model.StoreScoreEx) { - singelWeekData := []*model.StoreScoreEx{} + singleWeekData := []*model.StoreScoreEx{} weekIndex := 0 for _, value := range storeScoreList { if weekIndex == 0 { - weekIndex = Time2Week(value.CreatedAt) + weekIndex = Time2Week(value.ScoreDate) } - if weekIndex == Time2Week(value.CreatedAt) { - singelWeekData = append(singelWeekData, value) + if weekIndex == Time2Week(value.ScoreDate) { + singleWeekData = append(singleWeekData, value) } else { - weekDataList = append(weekDataList, singelWeekData) - singelWeekData = []*model.StoreScoreEx{} + weekDataList = append(weekDataList, singleWeekData) + singleWeekData = []*model.StoreScoreEx{} weekIndex = 0 - singelWeekData = append(singelWeekData, value) + singleWeekData = append(singleWeekData, value) } } - if len(singelWeekData) > 0 { - weekDataList = append(weekDataList, singelWeekData) + if len(singleWeekData) > 0 { + weekDataList = append(weekDataList, singleWeekData) } return weekDataList @@ -745,9 +747,9 @@ func GetStoreScoreLevel(score int) int { return level } -func GetWeeklyStoreScore(storeID, weekIndex int) (outWeeklyStoreScoreDataList []*model.WeeklyStoreScore, err error) { +func GetWeeklyStoreScore(storeID, weekIndexParam int) (outWeeklyStoreScoreDataList []*model.WeeklyStoreScore, err error) { db := dao.GetDB() - storeScoreList, err := dao.GetLatestWeeklyStoreScoreList(db, storeID, 5) + storeScoreList, err := dao.GetLatestWeeklyStoreScoreList(db, storeID, WeekNum) if err == nil && len(storeScoreList) > 0 { weeklyStoreScoreDataList := []*model.WeeklyStoreScore{} weekDataList := SplitToSingleWeekDataList(storeScoreList) @@ -765,13 +767,13 @@ func GetWeeklyStoreScore(storeID, weekIndex int) (outWeeklyStoreScoreDataList [] refutil.SetObjFieldByName(weeklyData, fieldName, destFieldValue+srcFieldValue) } if weekDataCount == 1 { - weeklyData.BeginTime = dayData.CreatedAt - weeklyData.EndTime = dayData.CreatedAt + weeklyData.BeginTime = dayData.ScoreDate + weeklyData.EndTime = dayData.ScoreDate } else { if dayIndex == 0 { - weeklyData.EndTime = dayData.CreatedAt + weeklyData.EndTime = dayData.ScoreDate } else if dayIndex == weekDataCount-1 { - weeklyData.BeginTime = dayData.CreatedAt + weeklyData.BeginTime = dayData.ScoreDate } } weeklyData.StoreName = dayData.StoreName @@ -787,10 +789,10 @@ func GetWeeklyStoreScore(storeID, weekIndex int) (outWeeklyStoreScoreDataList [] } weeklyData.Level = GetStoreScoreLevel(weeklyData.TotalScore) } - if weekIndex == -1 { + if weekIndexParam == -1 { outWeeklyStoreScoreDataList = weeklyStoreScoreDataList } else { - outWeeklyStoreScoreDataList = []*model.WeeklyStoreScore{weeklyStoreScoreDataList[weekIndex]} + outWeeklyStoreScoreDataList = []*model.WeeklyStoreScore{weeklyStoreScoreDataList[weekIndexParam]} } }