开斋节活动

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
 	})
 }

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)
 	}
 }

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 {
 		// 加入房间缓存