增加客服上传账号统计
This commit is contained in:
@@ -130,9 +130,18 @@ func (r *Repository) listingDailyOverview(ctx context.Context, now time.Time, da
|
||||
Scan(&events).Error; err != nil {
|
||||
return ListingDailyOverviewDTO{}, err
|
||||
}
|
||||
uploads := make([]listingUploaderRow, 0)
|
||||
if err := db.Table("listing_uploads").
|
||||
Select("COALESCE(matched_admin_id, 0) AS uploader_id, uploader_name, created_at").
|
||||
Where("listing_id IS NOT NULL").
|
||||
Where("created_at >= ? AND created_at < ?", start, end).
|
||||
Scan(&uploads).Error; err != nil {
|
||||
return ListingDailyOverviewDTO{}, err
|
||||
}
|
||||
|
||||
byDay := make(map[string]*listingDailyBucket, days)
|
||||
byChannel := make(map[listingChannelKey]*listingDailyBucket)
|
||||
byUploader := make(map[listingUploaderKey]int64)
|
||||
for _, ev := range events {
|
||||
key := ev.CreatedAt.In(loc).Format("2006-01-02")
|
||||
b := byDay[key]
|
||||
@@ -152,6 +161,11 @@ func (r *Repository) listingDailyOverview(ctx context.Context, now time.Time, da
|
||||
}
|
||||
addListingDailyEvent(cb, ev.EventType, ev.Source)
|
||||
}
|
||||
for _, upload := range uploads {
|
||||
key := upload.CreatedAt.In(loc).Format("2006-01-02")
|
||||
uploaderKey := listingUploaderKey{date: key, uploaderID: upload.UploaderID, uploaderName: upload.UploaderName}
|
||||
byUploader[uploaderKey]++
|
||||
}
|
||||
|
||||
trend := make([]ListingDayStatsDTO, 0, days)
|
||||
for i := days - 1; i >= 0; i-- {
|
||||
@@ -171,27 +185,48 @@ func (r *Repository) listingDailyOverview(ctx context.Context, now time.Time, da
|
||||
todayStats = trend[len(trend)-1]
|
||||
}
|
||||
channelTrend := listingChannelTrend(byChannel)
|
||||
uploaderTrend := listingUploaderTrend(byUploader)
|
||||
todayChannels := make([]ListingChannelDayStatsDTO, 0)
|
||||
for _, item := range channelTrend {
|
||||
if item.Date == todayStats.Date {
|
||||
todayChannels = append(todayChannels, item)
|
||||
}
|
||||
}
|
||||
todayUploaders := make([]ListingUploaderDayStatsDTO, 0)
|
||||
for _, item := range uploaderTrend {
|
||||
if item.Date == todayStats.Date {
|
||||
todayUploaders = append(todayUploaders, item)
|
||||
}
|
||||
}
|
||||
return ListingDailyOverviewDTO{
|
||||
Today: todayStats,
|
||||
Trend: trend,
|
||||
TodayChannels: todayChannels,
|
||||
ChannelTrend: channelTrend,
|
||||
Days: days,
|
||||
Timezone: "Asia/Shanghai",
|
||||
Today: todayStats,
|
||||
Trend: trend,
|
||||
TodayChannels: todayChannels,
|
||||
ChannelTrend: channelTrend,
|
||||
TodayUploaders: todayUploaders,
|
||||
UploaderTrend: uploaderTrend,
|
||||
Days: days,
|
||||
Timezone: "Asia/Shanghai",
|
||||
}, nil
|
||||
}
|
||||
|
||||
type listingUploaderRow struct {
|
||||
UploaderID uint64
|
||||
UploaderName string
|
||||
CreatedAt time.Time
|
||||
}
|
||||
|
||||
type listingChannelKey struct {
|
||||
date string
|
||||
sourceChannel string
|
||||
}
|
||||
|
||||
type listingUploaderKey struct {
|
||||
date string
|
||||
uploaderID uint64
|
||||
uploaderName string
|
||||
}
|
||||
|
||||
type listingDailyBucket struct {
|
||||
published int64
|
||||
activeOffline int64
|
||||
@@ -244,6 +279,35 @@ func listingChannelTrend(rows map[listingChannelKey]*listingDailyBucket) []Listi
|
||||
return items
|
||||
}
|
||||
|
||||
func listingUploaderTrend(rows map[listingUploaderKey]int64) []ListingUploaderDayStatsDTO {
|
||||
keys := make([]listingUploaderKey, 0, len(rows))
|
||||
for key := range rows {
|
||||
keys = append(keys, key)
|
||||
}
|
||||
sort.Slice(keys, func(i, j int) bool {
|
||||
if keys[i].date != keys[j].date {
|
||||
return keys[i].date < keys[j].date
|
||||
}
|
||||
if rows[keys[i]] != rows[keys[j]] {
|
||||
return rows[keys[i]] > rows[keys[j]]
|
||||
}
|
||||
if keys[i].uploaderName != keys[j].uploaderName {
|
||||
return keys[i].uploaderName < keys[j].uploaderName
|
||||
}
|
||||
return keys[i].uploaderID < keys[j].uploaderID
|
||||
})
|
||||
items := make([]ListingUploaderDayStatsDTO, 0, len(keys))
|
||||
for _, key := range keys {
|
||||
items = append(items, ListingUploaderDayStatsDTO{
|
||||
Date: key.date,
|
||||
UploaderID: key.uploaderID,
|
||||
UploaderName: key.uploaderName,
|
||||
UploadCount: rows[key],
|
||||
})
|
||||
}
|
||||
return items
|
||||
}
|
||||
|
||||
func listingChannelRank(channel string) int {
|
||||
switch channel {
|
||||
case "咸鱼":
|
||||
|
||||
Reference in New Issue
Block a user