From 2fcefb226bcd3c67ccc1ba8c93d3247820bbafc1 Mon Sep 17 00:00:00 2001 From: hujiebin Date: Fri, 16 Jun 2023 18:05:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96ggroupId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- domain/model/cp_m/level.go | 12 ++---------- domain/service/event_s/cp_level.go | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/domain/model/cp_m/level.go b/domain/model/cp_m/level.go index 283e924..5d1d8b6 100644 --- a/domain/model/cp_m/level.go +++ b/domain/model/cp_m/level.go @@ -137,7 +137,7 @@ func InitCpLevel(model *domain.Model, cpId, userId1, userId2 mysql.ID) error { // 2.记录存在 // 2.1 在有效期内,直接加points后判断新level,升级需要更新有效期 // 2.2 不有效期内,算首充,重置points后判断新level,升级需要更新有效期 -func AddCpLevelPoints(model *domain.Model, cpRelation CpRelation, points mysql.Num, sceneType gift_e.GiftOperateSceneType) (err error) { +func AddCpLevelPoints(model *domain.Model, cpRelation CpRelation, points mysql.Num, sceneType gift_e.GiftOperateSceneType, sceneUid string) (err error) { start := time.Now() defer func() { model.Log.Infof("AddCpLevelPoints cost:%v,err:%v", time.Now().Sub(start), err) @@ -294,15 +294,7 @@ func AddCpLevelPoints(model *domain.Model, cpRelation CpRelation, points mysql.N model.Log.Errorf("") return } - levelMsgIdMap := map[cp_e.CpLevel]uint{ - cp_e.CpLevel1: 252, - cp_e.CpLevel2: 253, - cp_e.CpLevel3: 254, - cp_e.CpLevel4: 255, - cp_e.CpLevel5: 256, - } - content := fmt.Sprintf(GetTranslate(286, users[userId1].Language), GetTranslate(levelMsgIdMap[cpLevel.Level], users[userId1].Language)) - if err := rpc.SendCpUpgrade(users[userId1].Nick, users[userId2].Nick, users[userId1].Avatar, users[userId2].Avatar, uint32(cpLevel.Level), content); err != nil { + if err := rpc.SendCpUpgrade(users[userId1].Nick, users[userId2].Nick, users[userId1].Avatar, users[userId2].Avatar, uint32(cpLevel.Level), sceneUid); err != nil { model.Log.Errorf("SendCpUpgrade fail:%v", err) } }() diff --git a/domain/service/event_s/cp_level.go b/domain/service/event_s/cp_level.go index 6d0a4e1..859effa 100644 --- a/domain/service/event_s/cp_level.go +++ b/domain/service/event_s/cp_level.go @@ -26,7 +26,7 @@ func CpGiftEvent() { diamonds := sendGiftEvent.GiftN * sendGiftEvent.ResGift.DiamondNum // 有cp关系 if cpRelation, exits := cp_m.GetCpRelationPair(model, sendGiftEvent.SendUserId, receiverUid); exits { - if err := cp_m.AddCpLevelPoints(model, cpRelation, diamonds, sendGiftEvent.SceneType); err != nil { + if err := cp_m.AddCpLevelPoints(model, cpRelation, diamonds, sendGiftEvent.SceneType, sendGiftEvent.SceneUid); err != nil { model.Log.Errorf("AddCpLevelPoints fail:%v", err) } if err := cp_m.AddCpDayRank(model, cpRelation, diamonds); err != nil { -- 2.22.0