diff --git a/cron/cp_cron/anniversary.go b/cron/cp_cron/anniversary.go index 1bbda1c7cad16cd433571a7d557ab865f16b3695..86a89b5f52d6a45a1c216b744aa2892497ac011e 100644 --- a/cron/cp_cron/anniversary.go +++ b/cron/cp_cron/anniversary.go @@ -4,7 +4,6 @@ import ( "encoding/json" "git.hilo.cn/hilo-common/domain" "git.hilo.cn/hilo-common/resource/config" - "git.hilo.cn/hilo-common/sdk/tencentyun" "github.com/robfig/cron" "hilo-user/domain/model/cp_m" "hilo-user/domain/model/user_m" @@ -41,12 +40,13 @@ func CpAnniversaryNotice() { Content: v.Content, Timestamp: v.Timestamp, }) - if err := tencentyun.BatchSendCustomMsg(model, 1, users[0].ExternalId, []string{users[1].ExternalId}, string(data), "cp纪念日"); err != nil { - model.Log.Errorf("BatchSendCustomMsg fail:%v", err) - } - if err := tencentyun.BatchSendCustomMsg(model, 1, users[1].ExternalId, []string{users[0].ExternalId}, string(data), "cp纪念日"); err != nil { - model.Log.Errorf("BatchSendCustomMsg fail:%v", err) - } + println(data) // todo 小助手 + //if err := tencentyun.BatchSendCustomMsg(model, 1, users[0].ExternalId, []string{users[1].ExternalId}, string(data), "cp纪念日"); err != nil { + // model.Log.Errorf("BatchSendCustomMsg fail:%v", err) + //} + //if err := tencentyun.BatchSendCustomMsg(model, 1, users[1].ExternalId, []string{users[0].ExternalId}, string(data), "cp纪念日"); err != nil { + // model.Log.Errorf("BatchSendCustomMsg fail:%v", err) + //} if err := cp_m.UpdateCpAnniversaryReminded(model, v.ID); err != nil { model.Log.Errorf("UpdateCpAnniversaryReminded fail:%v", err) } diff --git a/cv/cp_cv/space.go b/cv/cp_cv/space.go index 0b391979db3c08b18e88e2a74dc847d3041a7a31..6dcd8597269ffdd7431dac86f089fd1e4cece8c5 100644 --- a/cv/cp_cv/space.go +++ b/cv/cp_cv/space.go @@ -52,10 +52,11 @@ type CvPrivilege struct { // cp空间页 type CvSpace struct { - CpInfo CvCpInfo `json:"cpInfo"` // cp信息 - CpLevel CvCpLevel `json:"cpLevel"` // cp等级 - ResLevelList []CvResLevel `json:"resLevelList"` // 资源等级列表,无称号/恋爱CP/甜蜜CP/忠诚CP/炽热CP/荣耀CP - PrivilegeList [][]CvPrivilege `json:"privilegeList"` // 等级特权 + CpInfo CvCpInfo `json:"cpInfo"` // cp信息 + CpLevel CvCpLevel `json:"cpLevel"` // cp等级 + ResLevelList []CvResLevel `json:"resLevelList"` // 资源等级列表,无称号/恋爱CP/甜蜜CP/忠诚CP/炽热CP/荣耀CP + PrivilegeList [][]CvPrivilege `json:"privilegeList"` // 等级特权 + CpAnniversary []CvCpAnniversary `json:"cpAnniversary"` // 提醒的纪念日 } var CvResLevelList = []CvResLevel{ diff --git a/domain/model/cp_m/anniversary.go b/domain/model/cp_m/anniversary.go index 70f5305159060a73ffedccfe7a148b58aef5a27e..648bdf69f37102e42d1624d78d9bdaf7c350b497 100644 --- a/domain/model/cp_m/anniversary.go +++ b/domain/model/cp_m/anniversary.go @@ -98,7 +98,8 @@ func GetAllCpAnniversary(model *domain.Model, userId mysql.ID) []CpAnniversary { func GetNeedRemindCpAnniversary(model *domain.Model) []CpAnniversary { var res []CpAnniversary if err := model.DB().Model(CpAnniversary{}). - Where("`timestamp` > ?", time.Now().Unix()). + Where("`timestamp` >= ?", time.Now().Unix()-86400). + Where("`timestamp` < ?", time.Now().Unix()). Where("is_remind = 1"). Where("reminded = ?", mysql.NO). Find(&res).Error; err != nil { @@ -107,6 +108,20 @@ func GetNeedRemindCpAnniversary(model *domain.Model) []CpAnniversary { return res } +// 获取cp当天需要提醒的纪念日 +func GetUserTodayCpAnniversary(model *domain.Model, cpId mysql.ID) []CpAnniversary { + var res []CpAnniversary + if err := model.DB().Model(CpAnniversary{}). + Where("`timestamp` >= ?", time.Now().Unix()-86400). + Where("`timestamp` < ?", time.Now().Unix()). + Where("is_remind = 1"). + Where("cp_id = ?", cpId). + Find(&res).Error; err != nil { + model.Log.Errorf("GetUserTodayCpAnniversary fail:%v", err) + } + return res +} + func UpdateCpAnniversaryReminded(model *domain.Model, id mysql.ID) error { return model.DB().Model(CpAnniversary{}).Where("id = ?", id).Update("reminded", mysql.YES).Error } diff --git a/route/cp_r/space.go b/route/cp_r/space.go index a68d9b1ae2354de16ec173fe9878c0b5b12006b3..64e8e70d6ed851813a06a0f0273a1d1b7df0fc93 100644 --- a/route/cp_r/space.go +++ b/route/cp_r/space.go @@ -128,6 +128,17 @@ func CpSpace(c *gin.Context) (*mycontext.MyContext, error) { if cpUserInfo != nil { response.CpInfo.CpUserInfo = user_cv.UserToTiny(*cpUserInfo) } + // 需要提醒的纪念日 + if exists && (userId == cpRelation.UserId1 || userId == cpRelation.UserId2) { + anniversary := cp_m.GetUserTodayCpAnniversary(model, cpRelation.ID) + for _, a := range anniversary { + response.CpAnniversary = append(response.CpAnniversary, cp_cv.CvCpAnniversary{ + Id: a.ID, + Content: a.Content, + Timestamp: a.Timestamp, + }) + } + } resp.ResponseOk(c, response) return myContext, nil }