Commit fbd791a1 authored by chenweijian's avatar chenweijian

开斋节活动

parent 5880cbca
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"git.hilo.cn/hilo-common/domain" "git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/mycontext"
"git.hilo.cn/hilo-common/mylogrus" "git.hilo.cn/hilo-common/mylogrus"
"git.hilo.cn/hilo-common/resource/config" "git.hilo.cn/hilo-common/resource/config"
"git.hilo.cn/hilo-common/resource/mysql" "git.hilo.cn/hilo-common/resource/mysql"
...@@ -120,6 +121,7 @@ func (s *GroupService) LeaveGroupMember(model *domain.Model, groupId string, use ...@@ -120,6 +121,7 @@ func (s *GroupService) LeaveGroupMember(model *domain.Model, groupId string, use
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) (string, string, error) {
var channelId string var channelId string
var token string var token string
var rideId uint64
err := s.svc.Transactional(func() error { err := s.svc.Transactional(func() error {
//检查群组是否存在, 没有真正的domel,直接service上怼 //检查群组是否存在, 没有真正的domel,直接service上怼
model := domain.CreateModel(s.svc.CtxAndDb) model := domain.CreateModel(s.svc.CtxAndDb)
...@@ -245,6 +247,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin ...@@ -245,6 +247,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin
NobleLevel: nobleLevel, NobleLevel: nobleLevel,
Svip: rpc.CopySimpleSvip(svip), Svip: rpc.CopySimpleSvip(svip),
} }
rideId = r.RideId
buf, err := json.Marshal(r) buf, err := json.Marshal(r)
if err == nil { if err == nil {
...@@ -276,6 +279,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin ...@@ -276,6 +279,7 @@ func (s *GroupService) GroupIn(userId uint64, externalId string, groupUuid strin
if err != nil { if err != nil {
return "", "", err return "", "", err
} else { } else {
go dealActDataAfterEnterRoom(s.svc.MyContext, userId, rideId)
return channelId, token, nil return channelId, token, nil
} }
} }
...@@ -453,3 +457,11 @@ func (s *GroupService) GroupClearScreenByMgr(groupId string, userId uint64) erro ...@@ -453,3 +457,11 @@ func (s *GroupService) GroupClearScreenByMgr(groupId string, userId uint64) erro
signal_s.SendSignalMsg(model, groupId, systemMsg, false) signal_s.SendSignalMsg(model, groupId, systemMsg, false)
return nil return nil
} }
func dealActDataAfterEnterRoom(myContext *mycontext.MyContext, userId, rideId uint64) {
defer utils.CheckGoPanic()
if rideId == 1241 {
// 处理活动数据
go rpc.AddActPoint(domain.CreateModelContext(myContext), userId, 5)
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment