From 5feda91bc059d5ee87ee559950a3f746f1e4bcb2 Mon Sep 17 00:00:00 2001 From: hujiebin Date: Fri, 10 Mar 2023 14:08:53 +0800 Subject: [PATCH] =?UTF-8?q?todo=20=E7=9C=8B=E7=9C=8B=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=A7=BB=E5=87=BA=E5=8E=BB=E5=A4=96=E9=9D=A2,=E6=88=96?= =?UTF-8?q?=E8=80=85=E5=8F=91=E4=B8=80=E4=B8=AA=E4=BA=8B=E4=BB=B6=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _const/enum/msg_e/msg.go | 36 +++++++++++++----------- domain/model/groupPower_m/group_grade.go | 12 ++++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/_const/enum/msg_e/msg.go b/_const/enum/msg_e/msg.go index a6ed59d..3c0bbec 100644 --- a/_const/enum/msg_e/msg.go +++ b/_const/enum/msg_e/msg.go @@ -114,23 +114,25 @@ const ( //也门活动通知 ActivityTriggerYemen = 27 //月充值活动通知 - ActivityTriggerMonthPay = 28 - FruitTycoonAward = 29 // 水果大亨获奖 - LuckyboxRecycle = 30 //幸运盒子回收 - HlTemp1 = 31 //产品黄蕾，2022/06/29 临时要求发给某人的小助手消息 - HLTemp2 = 32 //问卷调查 - NewUserInviteAuditPassed = 33 // 新用户奖励活动审核通过 - NewUserInviteAuditFailed = 34 // 新用户奖励活动审核不通过 - NewUserInviterAward = 35 // 新用户奖励活动邀请成功数达标 - PowerSupportSalary = 36 // 势力扶持工资领取 提醒 - CountryStarOrdinaryAward = 37 // 国家之星瓜分奖提醒 - GroupActivityRewardMsg = 38 // 群组活动钻石奖励提醒 - TemplateActAwardMsg = 39 // 通用模板活动奖励提醒 - TemplateSmsCode = 40 // 通用模板活动奖励提醒 - NewUserRegisterPush1 = 44 // 首次充值免费获得永久充值勋章！累积充值$50可申请特殊ID：ABBABB！ - NewUserRegisterPush2 = 45 // 邀请朋友来Hilo，最高获得100,000钻石奖励！ - NewUserRegisterPush3 = 46 // 举办首个活动，领取10,000钻石和35%奖杯奖励！ - ActFruitPutRankAward = 47 // 水果机投入排行榜提醒领奖 + ActivityTriggerMonthPay = 28 + FruitTycoonAward = 29 // 水果大亨获奖 + LuckyboxRecycle = 30 //幸运盒子回收 + HlTemp1 = 31 //产品黄蕾，2022/06/29 临时要求发给某人的小助手消息 + HLTemp2 = 32 //问卷调查 + NewUserInviteAuditPassed = 33 // 新用户奖励活动审核通过 + NewUserInviteAuditFailed = 34 // 新用户奖励活动审核不通过 + NewUserInviterAward = 35 // 新用户奖励活动邀请成功数达标 + PowerSupportSalary = 36 // 势力扶持工资领取 提醒 + CountryStarOrdinaryAward = 37 // 国家之星瓜分奖提醒 + GroupActivityRewardMsg = 38 // 群组活动钻石奖励提醒 + TemplateActAwardMsg = 39 // 通用模板活动奖励提醒 + TemplateSmsCode = 40 // 通用模板活动奖励提醒 + NewUserRegisterPush1 = 44 // 首次充值免费获得永久充值勋章！累积充值$50可申请特殊ID：ABBABB！ + NewUserRegisterPush2 = 45 // 邀请朋友来Hilo，最高获得100,000钻石奖励！ + NewUserRegisterPush3 = 46 // 举办首个活动，领取10,000钻石和35%奖杯奖励！ + ActFruitPutRankAward = 47 // 水果机投入排行榜提醒领奖 + ActGroupPowerUpgrade = 48 // 家族升级 + ActGroupPowerExpireNotice = 49 // 家族等级即将过期（每月20日） ) type MsgSysUserType = mysql.Type diff --git a/domain/model/groupPower_m/group_grade.go b/domain/model/groupPower_m/group_grade.go index 5f1ba37..ed2050e 100644 --- a/domain/model/groupPower_m/group_grade.go +++ b/domain/model/groupPower_m/group_grade.go @@ -8,6 +8,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" "hilo-group/_const/enum/groupPower_e" + "hilo-group/_const/enum/msg_e" + "hilo-group/domain/model/msg_m" "time" ) @@ -123,6 +125,16 @@ func IncrGroupPowerExp(txModel *domain.Model, groupPowerId mysql.ID, exp mysql.N if err = txModel.DB().Model(GroupPowerGrade{}).Where("group_power_id = ?", latestGrade.GroupPowerId).UpdateColumns(updateAttrs).Error; err != nil { return err } + // 升级发消息 // todo 看看需要移出去外面,或者发一个事件? + record1 := msg_m.NewUserRecord(txModel, 4522, msg_e.ActGroupPowerUpgrade, "", 0, "", "", "", "", "") + _ = record1.Persistent() + return nil + // 不加离线推送 + //user, err := user_m.GetUser(model, event.UserId) + //if err != nil { + // return err + //} + //return SendEmasMsgAssistant(model, user.ExternalId, user.DeviceType) } break } -- 2.22.0