tmp #99

Merged
李寻欢 merged 51 commits from tmp into hotfix 2024-08-20 16:45:07 +08:00
Showing only changes of commit fb9a51720e - Show all commits

View File

@ -3,6 +3,7 @@ package cleargroupuser
import ( import (
"fmt" "fmt"
"go-wechat/client" "go-wechat/client"
"go-wechat/common/current"
"go-wechat/model/entity" "go-wechat/model/entity"
"go-wechat/service" "go-wechat/service"
"go-wechat/utils" "go-wechat/utils"
@ -15,7 +16,7 @@ import (
func ClearGroupUser() { func ClearGroupUser() {
groups, err := service.GetAllEnableClearGroup() groups, err := service.GetAllEnableClearGroup()
if err != nil { if err != nil {
log.Printf("获取启用了聊天排行榜的群组失败, 错误信息: %v", err) log.Printf("获取启用了末位淘汰的群组失败, 错误信息: %v", err)
return return
} }
@ -56,7 +57,9 @@ func ClearGroupUser() {
// @param days 需要清理的未活跃的天数 // @param days 需要清理的未活跃的天数
// @return members // @return members
func getNeedDeleteMembers(groupId string, days int) (members []entity.GroupUser) { func getNeedDeleteMembers(groupId string, days int) (members []entity.GroupUser) {
err := client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", groupId). err := client.MySQL.Model(&entity.GroupUser{}).
Where("group_id = ?", groupId).
Where("wxid != ?", current.GetRobotInfo().WxId).
Where("is_member IS TRUE"). Where("is_member IS TRUE").
Where("DATEDIFF( NOW(), last_active ) >= ?", days). Where("DATEDIFF( NOW(), last_active ) >= ?", days).
Order("last_active DESC"). Order("last_active DESC").