update 删除点击事件;完善用户奖励事件;添加事件字段注释;删除openId过滤字段

game/game_cluster/internal/mdb/component.go

@@ -80,6 +80,7 @@ func LogstashMigrateTables() {
 	LogstashDB.AutoMigrate(&eventmodels.UserLoginEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.UserUpdateInfoEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.UserWithdrawEventContent{})
+	LogstashDB.AutoMigrate(&eventmodels.UserRewardEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.AssetsEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.InviteEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.DiceEventContent{})
@@ -87,6 +88,5 @@ func LogstashMigrateTables() {
 	LogstashDB.AutoMigrate(&eventmodels.JoinChannelEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.FollowEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.TaskFinishEventContent{})
-	LogstashDB.AutoMigrate(&eventmodels.ClickEventContent{})
 	LogstashDB.AutoMigrate(&eventmodels.BackendOperationEventContent{})
 }

game/game_cluster/internal/mdb/eventmodels/clickEvent.go

@@ -1,12 +0,0 @@
-package eventmodels
-
-// 点击事件
-type ClickEventContent struct {
-	UserBasic
-	EventBasic
-	ClickName string `json:"click_name"` // 点击事件的名称 eg:邀请按钮/分享按钮
-}
-
-func (e *ClickEventContent) EventName() string {
-	return "Click"
-}

game/game_cluster/internal/mdb/eventmodels/inviteEvent.go

@@ -4,11 +4,12 @@ package eventmodels
 type InviteEventContent struct {
 	UserBasic
 	EventBasic
-	InviterUserId     string `json:"inviter_user_id"`       // 邀请用户id
-	InviteUserId      string `json:"invite_user_id"`        // 被邀请用户id
-	IfInviteUserTgVip bool   `json:"if_invite_user_tg_vip"` // 被邀请用户是否为telegram会员
-	Platform          string `json:"platform"`              // 平台
-	Channel           string `json:"channel"`               // 渠道
+	Platform                  string `json:"platform"`                     // 平台
+	Channel                   string `json:"channel"`                      // 渠道
+	InviteUserId              string `json:"invite_user_id"`               // 被邀请用户id
+	IfInviteUserTgVip         bool   `json:"if_invite_user_tg_vip"`        // 被邀请用户是否为telegram会员
+	InviteUserLevel2          int    `json:"invite_user_level2"`           // 被邀请成功用户lv>2的人数
+	ContinuousInviteUserCount int    `json:"continuous_invite_user_count"` // 累计邀请成功人数
 }
 
 func (e *InviteEventContent) EventName() string {

game/game_cluster/internal/mdb/eventmodels/userRewardEvent.go

@@ -1,16 +1,26 @@
 package eventmodels
 
-import "github.com/mhaya/game/game_cluster/internal/data"
-
 // 用户奖励事件
 type UserRewardEventContent struct {
 	UserBasic
 	EventBasic
-	Source    int               `json:"source"` // 奖励来源
-	SourceId  int               `json:"sourceId"`
-	AddReward []data.ItemReward `json:"AddReward"` // 增加的道具
-	SubReward []data.ItemReward `json:"SubReward"` // 减少的道具
-	Desc      interface{}       `json:"desc"`
+	Source    int          `json:"source"` // 奖励来源
+	SourceId  int          `json:"sourceId"`
+	AddReward []ItemReward `json:"add_reward"` // 增加的道具
+	SubReward []ItemReward `json:"sub_reward"` // 减少的道具
+	Desc      interface{}  `json:"desc"`
+}
+
+type ItemReward struct {
+	ItemBaseType int `json:"item_base_type"` // itemType:道具基类型
+	ItemID       int `json:"item_id"`        // itemID:道具ID
+	Amount       int `json:"amount"`         // amount:数量
+}
+
+type DescDraw struct {
+	ID     int          `json:"id"`     // 中奖格子
+	CurID  int          `json:"cur_id"` // 规则ID
+	Reward []ItemReward `json:"reward"`
 }
 
 func (e *UserRewardEventContent) EventName() string {

game/game_cluster/nodes/logstash/module/event/enent.go

@@ -32,7 +32,6 @@ var (
 	_ Eventer = &eventmodels.JoinChannelEventContent{}
 	_ Eventer = &eventmodels.FollowEventContent{}
 	_ Eventer = &eventmodels.TaskFinishEventContent{}
-	_ Eventer = &eventmodels.ClickEventContent{}
 	_ Eventer = &eventmodels.BackendOperationEventContent{}
 )
 
@@ -55,7 +54,6 @@ func init() {
 	instance.AddEvent(new(eventmodels.JoinChannelEventContent))
 	instance.AddEvent(new(eventmodels.FollowEventContent))
 	instance.AddEvent(new(eventmodels.TaskFinishEventContent))
-	instance.AddEvent(new(eventmodels.ClickEventContent))
 	instance.AddEvent(new(eventmodels.BackendOperationEventContent))
 }
 

game/game_cluster/nodes/logstash/module/handlelog/actor_handle_log.go

@@ -2,7 +2,7 @@
  * @Author: Alvin Alvin@qq.com
  * @Date: 2024-09-24 18:54:19
  * @LastEditors: Alvin Alvin@qq.com
- * @LastEditTime: 2024-10-01 09:39:08
+ * @LastEditTime: 2024-10-01 15:25:38
  * @FilePath: \server\game\game_cluster\nodes\logstash\module\handlelog\actor_handle_log.go
  * @Description:
  * 处理其他服务发送的埋点日志
@@ -231,20 +231,6 @@ func (p *HandleLogObject) handlelogContent(req *param.HandleLogReq, e event.Even
 			return code.Error
 		}
 
-	case *eventmodels.ClickEventContent:
-		content := &eventmodels.ClickEventContent{}
-		err := json.Unmarshal([]byte(req.JsonContent), &content)
-		if err != nil {
-			mhayaLogger.Warnf("handlelog ClickEventContent Unmarshal err:%v", err)
-			return code.Error
-		}
-
-		err = mdb.LogstashDB.Create(content).Error
-		if err != nil {
-			mhayaLogger.Warnf("handlelog LogstashDB Create ClickEventContent err:%v", err)
-			return code.Error
-		}
-
 	case *eventmodels.BackendOperationEventContent:
 		content := &eventmodels.BackendOperationEventContent{}
 		err := json.Unmarshal([]byte(req.JsonContent), &content)

game/game_cluster/nodes/webadmin/entity/synthesis.go

@@ -4,7 +4,6 @@ type OverviewReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type OverviewResp struct {
@@ -36,7 +35,6 @@ type UserListReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type UserListResp struct {
@@ -59,7 +57,6 @@ type TurntableReq struct {
 	Page      int    `json:"page"`
 	Size      int    `json:"size"`
 	UserName  string `json:"user_name"`  // 用户名
-	OpenId    string `json:"openId"`     // 对应tgid
 	StartTime int64  `json:"start_time"` // 开始时间
 	EndTime   int64  `json:"end_time"`   // 结束时间
 }
@@ -81,7 +78,6 @@ type AssetsReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type AssetsResp struct {
@@ -91,7 +87,6 @@ type AssetsResp struct {
 
 type AssetsDetail struct {
 	UserName        string `json:"userName" bson:"userName"` // 用户名 用户ID
-	OpenId          string `json:"openId" bson:"openId"`     // 对应tgid
 	TonValue        int64  `json:"tonValue"`                 // 用户账户Ton值
 	UsdtValue       int64  `json:"usdtValue"`                // 用户账户USDT值
 	StatisticalDate int64  `json:"statisticalDate"`          // 统计日期
@@ -101,7 +96,6 @@ type AssetsRecordReq struct {
 	Page          int    `json:"page"`
 	Size          int    `json:"size"`
 	UserName      string `json:"user_name"`      // 用户名
-	OpenId        string `json:"openId"`         // 对应tgid
 	OperationType string `json:"operation_type"` // 操作类型 增加:increase;减少:decrease
 	Currency      string `json:"currency"`       // 货币类型
 	Amount        int64  `json:"amount"`         // 变动金额
@@ -127,7 +121,6 @@ type InviteReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type InviteResp struct {
@@ -138,7 +131,6 @@ type InviteResp struct {
 type InviteDetail struct {
 	UserName                        string `json:"userName" bson:"userName"`        // 用户名 用户ID
 	OpenId                          string `json:"openId" bson:"openId"`            // 对应tgid
-	InvitationHits                  int64  `json:"invitationHits"`                  // 邀请按钮点击次数
 	InviteID                        string `json:"inviteID"`                        // 被邀请成功用户ID
 	IfInviteVIP                     bool   `json:"ifInviteVIP"`                     // 被邀请人是否为telegram会员
 	InviteTime                      int64  `json:"inviteTime"`                      // 邀请成功时间
@@ -151,7 +143,6 @@ type ActiveReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type ActiveResp struct {
@@ -166,12 +157,9 @@ type ActiveDetail struct {
 	CreateTime                 int64  `json:"createTime" bson:"createTime"`         // 用户注册时间
 	LastLoginTime              int64  `json:"lastLoginTime" bson:"loginTime"`       // 用户最后一次登录日期
 	MaxSuccessions             int    `json:"maxSuccessions" bson:"maxSuccessions"` // 用户累计登录天数
-	DiceHits                   int64  `json:"diceHits"`                             // 用户骰子点击次数
-	InvitationHits             int64  `json:"invitationHits"`                       // 邀请按钮点击次数
 	SuccessfulInvitations      int64  `json:"successfulInvitations"`                // 用户邀请成功人数
 	Withdrawals                int64  `json:"withdrawals"`                          // 用户提现次数
 	CumulativeWithdrawalAmount int64  `json:"cumulativeWithdrawalAmount"`           // 用户累计提现金额
-	TurntableClicks            int64  `json:"turntableClicks"`                      // 用户转盘点击次数
 	TurntableRuns              int64  `json:"turntableRuns"`                        // 用户转盘实际抽奖次数
 }
 
@@ -179,7 +167,6 @@ type TaskCompletionReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type TaskCompletionResp struct {
@@ -203,7 +190,6 @@ type BehaviorMonitoringReq struct {
 	Page     int    `json:"page"`
 	Size     int    `json:"size"`
 	UserName string `json:"user_name"` // 用户名
-	OpenId   string `json:"openId"`    // 对应tgid
 }
 
 type BehaviorMonitoringResp struct {

game/game_cluster/nodes/webadmin/service/playerMange.go

@@ -10,7 +10,6 @@ import (
 	"github.com/mhaya/game/game_cluster/internal/mdb"
 	"github.com/mhaya/game/game_cluster/internal/mdb/eventmodels"
 	"github.com/mhaya/game/game_cluster/internal/mdb/models"
-	"github.com/mhaya/game/game_cluster/internal/param"
 	"github.com/mhaya/game/game_cluster/nodes/webadmin/common"
 	"github.com/mhaya/game/game_cluster/nodes/webadmin/entity"
 	mhayaLogger "github.com/mhaya/logger"
@@ -181,63 +180,6 @@ func (a *PlayerManage) GetMaxSuccessions(userName string) (int64, *code.Result)
 	return loginCount, nil
 }
 
-// 获取用户骰子点击次数
-func (a *PlayerManage) GetDiceHits(userName string) (int64, *code.Result) {
-	diceClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: userName,
-		},
-		ClickName: string(constant.DiceClickName),
-	}
-	clickDb := mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(diceClickWhere).Order("create_at")
-	var diceHits int64
-	err := clickDb.Count(&diceHits).Error
-	if err != nil {
-		mhayaLogger.Warnf("GetDiceHits diceHits error:%v", err)
-		return 0, common.NewResult(code.InternalError)
-	}
-
-	return diceHits, nil
-}
-
-// 获取邀请点击次数
-func (a *PlayerManage) GetInvitationHits(userName string) (int64, *code.Result) {
-	inviteClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: userName,
-		},
-		ClickName: string(constant.InviteClickName),
-	}
-	clickDb := mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(inviteClickWhere).Order("create_at")
-	var invitationHits int64
-	err := clickDb.Count(&invitationHits).Error
-	if err != nil {
-		mhayaLogger.Warnf("GetInvitationHits invitationHits error:%v", err)
-		return 0, common.NewResult(code.InternalError)
-	}
-
-	return invitationHits, nil
-}
-
-// 获取转盘点击次数
-func (a *PlayerManage) GetTurntableClicks(userName string) (int64, *code.Result) {
-	turntableClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: userName,
-		},
-		ClickName: string(constant.TurntableClickName),
-	}
-	clickDb := mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(turntableClickWhere).Order("create_at")
-	var turntableClicks int64
-	err := clickDb.Count(&turntableClicks).Error
-	if err != nil {
-		mhayaLogger.Warnf("GetTurntableClicks turntableClicks error:%v", err)
-		return 0, common.NewResult(code.InternalError)
-	}
-
-	return turntableClicks, nil
-}
-
 // 获取转盘实际抽奖次数
 func (a *PlayerManage) GetTurntableRuns(userName string) (int64, *code.Result) {
 	turntableWhere := &eventmodels.TurntableEventContent{
@@ -648,7 +590,7 @@ func (a *PlayerManage) RewardList(ctx context.Context, req entity.RewardListReq)
 					return nil
 				}
 
-				param, ok := v.Desc.(param.Draw)
+				param, ok := v.Desc.(eventmodels.DescDraw)
 				if ok {
 					return &entity.Desc{
 						ID:    param.ID,
@@ -679,7 +621,7 @@ func (a *PlayerManage) RewardList(ctx context.Context, req entity.RewardListReq)
 	}, nil
 }
 
-func (a *PlayerManage) packItemReward(reward data.ItemReward) *entity.ShowItemReward {
+func (a *PlayerManage) packItemReward(reward eventmodels.ItemReward) *entity.ShowItemReward {
 	itemName := ""
 	cfg, exist := data.ItemConfig.Get(reward.ItemID)
 	if exist {

game/game_cluster/nodes/webadmin/service/synthesis.go

@@ -45,9 +45,6 @@ func (s *Synthesis) Overview(req entity.OverviewReq) (*entity.OverviewResp, *cod
 	if req.UserName != "" {
 		filter["userName"] = req.UserName
 	}
-	if req.OpenId != "" {
-		filter["openId"] = req.OpenId
-	}
 
 	// 设置分页选项
 	findOptions := options.Find()
@@ -105,9 +102,6 @@ func (s *Synthesis) UserList(req entity.UserListReq) (*entity.UserListResp, *cod
 	if req.UserName != "" {
 		filter["userName"] = req.UserName
 	}
-	if req.OpenId != "" {
-		filter["openId"] = req.OpenId
-	}
 
 	// 设置分页选项
 	findOptions := options.Find()
@@ -766,10 +760,6 @@ func (s *Synthesis) Turntable(req entity.TurntableReq) (*entity.TurntableResp, *
 	where := &eventmodels.TurntableEventContent{
 		UserBasic: eventmodels.UserBasic{
 			UserId: req.UserName,
-			TgId:   req.OpenId,
-		},
-		EventBasic: eventmodels.EventBasic{
-			ServerId: s.nodeId,
 		},
 	}
 	db := mdb.LogstashDB.Model(&eventmodels.TurntableEventContent{}).Where(where).Order("create_at")
@@ -807,15 +797,12 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 	page, pageSize := checkPageParam(req.Page, req.Size)
 
 	// 根据条件查询
-	if req.UserName != "" || req.OpenId != "" {
+	if req.UserName != "" {
 		// 构建查询条件
 		filter := bson.M{}
 		if req.UserName != "" {
 			filter["userName"] = req.UserName
 		}
-		if req.OpenId != "" {
-			filter["openId"] = req.OpenId
-		}
 
 		var playerInfo *models.Player
 		err := mdb.MDB.Collection(constant.CNamePlayer).FindOne(context.Background(), filter).Decode(&playerInfo)
@@ -830,7 +817,7 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 
 		var results []*entity.AssetsDetail
 
-		detail, codeResult := s.getAsset(req.UserName, req.OpenId)
+		detail, codeResult := s.getAsset(req.UserName)
 		if codeResult != nil {
 			mhayaLogger.Warnf("Assets getAsset error:%v", codeResult)
 			return nil, codeResult
@@ -857,7 +844,7 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 
 	var results []*entity.AssetsDetail
 	for _, detail := range listResp.Details {
-		ret, codeResult := s.getAsset(detail.UserName, detail.OpenId)
+		ret, codeResult := s.getAsset(detail.UserName)
 		if codeResult != nil {
 			mhayaLogger.Warnf("Assets getAsset error:%v", codeResult)
 			return nil, codeResult
@@ -878,13 +865,12 @@ func (s *Synthesis) Assets(req entity.AssetsReq) (*entity.AssetsResp, *code.Resu
 	}, nil
 }
 
-func (s *Synthesis) getAsset(userName, openId string) (*entity.AssetsDetail, *code.Result) {
+func (s *Synthesis) getAsset(userName string) (*entity.AssetsDetail, *code.Result) {
 	var totalUsdtAmount int64
 	var totalTonAmount int64
 	where := &eventmodels.AssetsEventContent{
 		UserBasic: eventmodels.UserBasic{
 			UserId: userName,
-			TgId:   openId,
 		},
 		EventBasic: eventmodels.EventBasic{
 			ServerId: s.nodeId,
@@ -906,7 +892,6 @@ func (s *Synthesis) getAsset(userName, openId string) (*entity.AssetsDetail, *co
 
 	return &entity.AssetsDetail{
 		UserName:        userName,
-		OpenId:          openId,
 		TonValue:        totalTonAmount,
 		UsdtValue:       totalUsdtAmount,
 		StatisticalDate: mhayaTime.Now().Unix(),
@@ -934,7 +919,6 @@ func (s *Synthesis) AssetsRecord(req entity.AssetsRecordReq) (*entity.AssetsReco
 	where := &eventmodels.AssetsEventContent{
 		UserBasic: eventmodels.UserBasic{
 			UserId: req.UserName,
-			TgId:   req.OpenId,
 		},
 		EventBasic: eventmodels.EventBasic{
 			ServerId: s.nodeId,
@@ -983,7 +967,6 @@ func (s *Synthesis) Invite(req entity.InviteReq) (*entity.InviteResp, *code.Resu
 	where := &eventmodels.InviteEventContent{
 		UserBasic: eventmodels.UserBasic{
 			UserId: req.UserName,
-			TgId:   req.OpenId,
 		},
 	}
 	db := mdb.LogstashDB.Model(&eventmodels.InviteEventContent{}).Where(where).Order("create_at")
@@ -1000,12 +983,11 @@ func (s *Synthesis) Invite(req entity.InviteReq) (*entity.InviteResp, *code.Resu
 		results = append(results, &entity.InviteDetail{
 			UserName:                        v.UserName,
 			OpenId:                          v.TgId,
-			InvitationHits:                  0, // TODO
-			InviteID:                        v.InviterUserId,
+			InviteID:                        v.UserId,
 			IfInviteVIP:                     v.IfInviteUserTgVip,
 			InviteTime:                      v.CreateAt,
-			SuccessfulInvitationsLV2:        0, // TODO
-			CumulativesuccessfulInvitations: 0, // TODO
+			SuccessfulInvitationsLV2:        int64(v.InviteUserLevel2),
+			CumulativesuccessfulInvitations: int64(v.ContinuousInviteUserCount),
 			InvitationChannel:               v.Channel,
 		})
 	}
@@ -1021,15 +1003,12 @@ func (s *Synthesis) Active(req entity.ActiveReq) (*entity.ActiveResp, *code.Resu
 	page, pageSize := checkPageParam(req.Page, req.Size)
 
 	// 根据条件查询
-	if req.UserName != "" || req.OpenId != "" {
+	if req.UserName != "" {
 		// 构建查询条件
 		filter := bson.M{}
 		if req.UserName != "" {
 			filter["userName"] = req.UserName
 		}
-		if req.OpenId != "" {
-			filter["openId"] = req.OpenId
-		}
 
 		var playerInfo *models.Player
 		err := mdb.MDB.Collection(constant.CNamePlayer).FindOne(context.Background(), filter).Decode(&playerInfo)
@@ -1111,30 +1090,6 @@ func (s *Synthesis) getActive(playerInfo *models.Player) (*entity.ActiveDetail,
 	var loginCount int64
 	loginDb.Count(&loginCount)
 
-	// 骰子点击次数
-	diceClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: playerInfo.UserName,
-			TgId:   playerInfo.OpenId,
-		},
-		ClickName: string(constant.DiceClickName),
-	}
-	clickDb := mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(diceClickWhere).Order("create_at")
-	var diceHits int64
-	clickDb.Count(&diceHits)
-
-	// 邀请点击次数
-	inviteClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: playerInfo.UserName,
-			TgId:   playerInfo.OpenId,
-		},
-		ClickName: string(constant.InviteClickName),
-	}
-	clickDb = mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(inviteClickWhere).Order("create_at")
-	var invitationHits int64
-	clickDb.Count(&invitationHits)
-
 	// 邀请成功人数
 	inviteWhere := &eventmodels.InviteEventContent{
 		UserBasic: eventmodels.UserBasic{
@@ -1178,18 +1133,6 @@ func (s *Synthesis) getActive(playerInfo *models.Player) (*entity.ActiveDetail,
 		return nil, common.NewResult(code.InternalError)
 	}
 
-	// 转盘点击次数
-	turntableClickWhere := &eventmodels.ClickEventContent{
-		UserBasic: eventmodels.UserBasic{
-			UserId: playerInfo.UserName,
-			TgId:   playerInfo.OpenId,
-		},
-		ClickName: string(constant.TurntableClickName),
-	}
-	clickDb = mdb.LogstashDB.Model(&eventmodels.ClickEventContent{}).Where(turntableClickWhere).Order("create_at")
-	var turntableClicks int64
-	clickDb.Count(&turntableClicks)
-
 	// 转盘实际抽奖次数
 	turntableWhere := &eventmodels.TurntableEventContent{
 		UserBasic: eventmodels.UserBasic{
@@ -1208,12 +1151,9 @@ func (s *Synthesis) getActive(playerInfo *models.Player) (*entity.ActiveDetail,
 		CreateTime:                 playerInfo.JoinTime,
 		LastLoginTime:              playerInfo.PrevTime,
 		MaxSuccessions:             int(loginCount),
-		DiceHits:                   diceHits,
-		InvitationHits:             invitationHits,
 		SuccessfulInvitations:      successfulInvitations,
 		Withdrawals:                withdrawals,
 		CumulativeWithdrawalAmount: cumulativeWithdrawalAmount,
-		TurntableClicks:            turntableClicks,
 		TurntableRuns:              turntableRuns,
 	}, nil
 }
@@ -1227,9 +1167,6 @@ func (s *Synthesis) TaskCompletion(req entity.TaskCompletionReq) (*entity.TaskCo
 	if req.UserName != "" {
 		filter["userName"] = req.UserName
 	}
-	if req.OpenId != "" {
-		filter["openId"] = req.OpenId
-	}
 
 	// 设置分页选项
 	findOptions := options.Find()
@@ -1287,9 +1224,6 @@ func (s *Synthesis) BehaviorMonitoring(req entity.BehaviorMonitoringReq) (*entit
 	if req.UserName != "" {
 		filter["userName"] = req.UserName
 	}
-	if req.OpenId != "" {
-		filter["openId"] = req.OpenId
-	}
 
 	// 设置分页选项
 	findOptions := options.Find()