diff --git a/domain/service/event_s/event_init.go b/domain/service/event_s/event_init.go index ca3d376a6bc1a1d7350fa20e5a9b53e823d59ba6..5a79f0f2b894840c69c630a0e0e115ea1bf0013e 100644 --- a/domain/service/event_s/event_init.go +++ b/domain/service/event_s/event_init.go @@ -554,7 +554,7 @@ func OnMic() { model.Log.Infof("cron micIn IncrUserOnMic success,userId:%v", event.UserId) } // 处理活动数据 - go rpc.AddActPoint(model, event.UserId, 1) + 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 55efac5ec574bdd7b8d07f52e0bb2c75f72e008d..cbf714804464a69b8fb82c30244046ca1b9239c8 100644 --- a/domain/service/group_s/group_op.go +++ b/domain/service/group_s/group_op.go @@ -118,7 +118,7 @@ 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 @@ -279,7 +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) + go dealActDataAfterEnterRoom(s.svc.MyContext, userId, rideId, roomId) return channelId, token, nil } } @@ -458,10 +458,10 @@ func (s *GroupService) GroupClearScreenByMgr(groupId string, userId uint64) erro return nil } -func dealActDataAfterEnterRoom(myContext *mycontext.MyContext, userId, rideId uint64) { +func dealActDataAfterEnterRoom(myContext *mycontext.MyContext, userId, rideId uint64, roomId int64) { defer utils.CheckGoPanic() if rideId == 1241 { // 处理活动数据 - go rpc.AddActPoint(domain.CreateModelContext(myContext), userId, 5) + 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 f1d7d604e43b6867f8550aac8b21a03994b398cf..f3839ac999fc7ce02d46f22ffb5fdd018b9779e3 100644 --- a/route/group_r/group_op.go +++ b/route/group_r/group_op.go @@ -1777,7 +1777,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 { // 加入房间缓存