lxh/go-wxhelper
4
4
Fork 5
Code Issues 3 Pull Requests Actions Packages Projects 2 Releases 114 Wiki Activity

Merge pull request 'hotfix' (#28) from hotfix into main
All checks were successful
BuildImage / build-image (push) Successful in 1m24s
Details

Browse Source 
Reviewed-on: #28
This commit is contained in:
李寻欢 2024-03-11 14:56:45 +08:00
commit 8bac050a02
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/watergroup/month.go
View File

@ -60,12 +60,15 @@ func dealMonth(gid string) {
// 查询群成员总数 // 查询群成员总数
var groupUsers int64 var groupUsers int64
err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error err = client.MySQL.Model(&entity.GroupUser{}).
Where("group_id = ?", gid).
Where("is_member IS TRUE").
Count(&groupUsers).Error
if err != nil { if err != nil {
log.Printf("查询群成员总数失败, 错误信息: %v", err) log.Printf("查询群成员总数失败, 错误信息: %v", err)
} }
// 计算活跃度 // 计算活跃度
showActivity := err != nil && groupUsers > 0 showActivity := err == nil && groupUsers > 0
activity := "0.00" activity := "0.00"
if groupUsers > 0 { if groupUsers > 0 {
activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100) activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)

7
tasks/watergroup/week.go
View File

@ -59,12 +59,15 @@ func dealWeek(gid string) {
// 查询群成员总数 // 查询群成员总数
var groupUsers int64 var groupUsers int64
err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error err = client.MySQL.Model(&entity.GroupUser{}).
Where("group_id = ?", gid).
Where("is_member IS TRUE").
Count(&groupUsers).Error
if err != nil { if err != nil {
log.Printf("查询群成员总数失败, 错误信息: %v", err) log.Printf("查询群成员总数失败, 错误信息: %v", err)
} }
// 计算活跃度 // 计算活跃度
showActivity := err != nil && groupUsers > 0 showActivity := err == nil && groupUsers > 0
activity := "0.00" activity := "0.00"
if groupUsers > 0 { if groupUsers > 0 {
activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100) activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)

7
tasks/watergroup/year.go
View File

@ -59,12 +59,15 @@ func dealYear(gid string) {
// 查询群成员总数 // 查询群成员总数
var groupUsers int64 var groupUsers int64
err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error err = client.MySQL.Model(&entity.GroupUser{}).
Where("group_id = ?", gid).
Where("is_member IS TRUE").
Count(&groupUsers).Error
if err != nil { if err != nil {
log.Printf("查询群成员总数失败, 错误信息: %v", err) log.Printf("查询群成员总数失败, 错误信息: %v", err)
} }
// 计算活跃度 // 计算活跃度
showActivity := err != nil && groupUsers > 0 showActivity := err == nil && groupUsers > 0
activity := "0.00" activity := "0.00"
if groupUsers > 0 { if groupUsers > 0 {
activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100) activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)

7
tasks/watergroup/yesterday.go
View File

@ -61,12 +61,15 @@ func dealYesterday(gid string) {
// 查询群成员总数 // 查询群成员总数
var groupUsers int64 var groupUsers int64
err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error err = client.MySQL.Model(&entity.GroupUser{}).
Where("group_id = ?", gid).
Where("is_member IS TRUE").
Count(&groupUsers).Error
if err != nil { if err != nil {
log.Printf("查询群成员总数失败, 错误信息: %v", err) log.Printf("查询群成员总数失败, 错误信息: %v", err)
} }
// 计算活跃度 // 计算活跃度
showActivity := err != nil && groupUsers > 0 showActivity := err == nil && groupUsers > 0
activity := "0.00" activity := "0.00"
if groupUsers > 0 { if groupUsers > 0 {
activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100) activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)