diff --git a/domain/model/mic_m/mic.go b/domain/model/mic_m/mic.go index d83f144c4d8ad7973b2097256d3dd0f42673358b..36d51a5d75f62f1cd2e28cf28d3d8b8ef2bb0aef 100644 --- a/domain/model/mic_m/mic.go +++ b/domain/model/mic_m/mic.go @@ -25,7 +25,7 @@ type UserOnMic struct { // 允许返回gorm.ErrRecordNotFound func GetUserOnMic(model *domain.Model, userId mysql.ID, tz timezone_e.Timezone) (*UserOnMic, error) { res := new(UserOnMic) - day := time.Now().Format("2006-01-02") + day := time.Now().In(timezone_e.TimezoneLocMap[tz]).Format("2006-01-02") if err := model.DB().Where("date = ? AND user_id = ? AND tz = ?", day, userId, tz).First(res).Error; err != nil { return nil, err } diff --git a/domain/service/event_s/event_init.go b/domain/service/event_s/event_init.go index dcbfbd579f2f20e8b3314aa554f0693d07860332..5a79f0f2b894840c69c630a0e0e115ea1bf0013e 100644 --- a/domain/service/event_s/event_init.go +++ b/domain/service/event_s/event_init.go @@ -553,6 +553,8 @@ func OnMic() { } else { model.Log.Infof("cron micIn IncrUserOnMic success,userId:%v", event.UserId) } + // 处理活动数据 + go rpc.AddActPoint(model, event.UserId, 1, 0) return nil }) } diff --git a/domain/service/group_s/group_op.go b/domain/service/group_s/group_op.go index 6618d9e124d52936b1a38c44a0be1e74e0f444a9..433e0b816b4bf3742dd46b5538df0869f67c5c26 100644 --- a/domain/service/group_s/group_op.go +++ b/domain/service/group_s/group_op.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "git.hilo.cn/hilo-common/domain" + "git.hilo.cn/hilo-common/mycontext" "git.hilo.cn/hilo-common/mylogrus" "git.hilo.cn/hilo-common/resource/config" "git.hilo.cn/hilo-common/resource/mysql" @@ -117,9 +118,10 @@ func (s *GroupService) LeaveGroupMember(model *domain.Model, groupId string, use } //进入房间, 返回channelId, err -func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid string, password, imei, ip string, provider group_e.GroupProvider) (string, string, error) { +func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid string, password, imei, ip string, provider group_e.GroupProvider, roomId int64) (string, string, error) { var channelId string var token string + var rideId uint64 err := s.svc.Transactional(func() error { //检查群组是否存在, 没有真正的domel,直接service上怼 model := domain.CreateModel(s.svc.CtxAndDb) @@ -245,6 +247,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin NobleLevel: nobleLevel, Svip: rpc.CopySimpleSvip(svip), } + rideId = r.RideId buf, err := json.Marshal(r) if err == nil { @@ -276,6 +279,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin if err != nil { return "", "", err } else { + go dealActDataAfterEnterRoom(s.svc.MyContext, userId, rideId, roomId) return channelId, token, nil } } @@ -453,3 +457,11 @@ func (s *GroupService) GroupClearScreenByMgr(groupId string, userId uint64) erro signal_s.SendSignalMsg(model, groupId, systemMsg, false) return nil } + +func dealActDataAfterEnterRoom(myContext *mycontext.MyContext, userId, rideId uint64, roomId int64) { + defer utils.CheckGoPanic() + if rideId == 1261 { + // 处理活动数据 + go rpc.AddActPoint(domain.CreateModelContext(myContext), userId, 5, roomId) + } +} diff --git a/route/group_r/group_op.go b/route/group_r/group_op.go index 20bfa2753dfaae78b6993753b878e6a6351b67e6..681e899460135484a1d7b97e17d9d445bd668466 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -1784,7 +1784,7 @@ func GroupIn(c *gin.Context) (*mycontext.MyContext, error) { } } - if channelId, token, err := group_s.NewGroupService(myContext).GroupIn(userId, externalId, groupId, password, imei, ip, provider); err != nil { + if channelId, token, err := group_s.NewGroupService(myContext).GroupIn(userId, externalId, groupId, password, imei, ip, provider, gi.Id); err != nil { return myContext, err } else { // 加入房间缓存