Merge branch 'feature/cp-new' into feature/3.9.0

cv/cp_cv/anniversary.go

@@ -16,7 +16,8 @@ type CvCpAnniversary struct {
 	CpInfo          *CvCpBase                `json:"cpInfo,omitempty"` // cp信息,type=1(头像)时候用到
 	Id              uint64                   `json:"id"`               // 记录id
 	Content         string                   `json:"content"`          // 纪念日内容
-	Timestamp int64                    `json:"timestamp"`        // 纪念日时间戳
+	OriginTimestamp int64                    `json:"originTimestamp"`  // 纪念日的时间
+	Timestamp       int64                    `json:"timestamp"`        // 下次纪念日时间戳
 	IsRemind        bool                     `json:"isRemind"`         // 是否提醒
 	CanDel          bool                     `json:"canDel"`           // 能否删除
 	IsTop           bool                     `json:"isTop"`            // 是否置顶

domain/model/cp_m/anniversary.go

@@ -34,10 +34,10 @@ func InitCpAnniversary(model *domain.Model, cp CpRelationTmp) error {
 	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeNormal, cp, "我们在一起", time.Now().Unix(), true, 100); err != nil {
 		return err
 	}
-	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeAnniversary, cp, fmt.Sprintf("%s的生日", users[cp.UserId1].Nick), int64(users[cp.UserId1].Birthday), true, 0); err != nil {
+	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeAnniversary, cp, fmt.Sprintf("%s的生日", users[cp.UserId1].Nick), 0, true, 0); err != nil {
 		return err
 	}
-	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeAnniversary, cp, fmt.Sprintf("%s的生日", users[cp.UserId2].Nick), int64(users[cp.UserId2].Birthday), true, 0); err != nil {
+	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeAnniversary, cp, fmt.Sprintf("%s的生日", users[cp.UserId2].Nick), 0, true, 0); err != nil {
 		return err
 	}
 	if err := AddCpAnniversary(model, cp_e.AnniversaryItemTypeNormal, cp, "第一次说我爱你", 0, false, 0); err != nil {

route/cp_r/anniversary.go

@@ -114,6 +114,7 @@ func PageAnniversary(c *gin.Context) (*mycontext.MyContext, error) {
 				UserInfo:   *userInfo,
 				CpUserInfo: *cpUserInfo,
 			},
+			OriginTimestamp: cpRelation.CreatedTime.Unix(),
 			Timestamp:       cpRelation.CreatedTime.Unix(),
 			CanDel:          false,
 		})
@@ -134,6 +135,7 @@ func PageAnniversary(c *gin.Context) (*mycontext.MyContext, error) {
 			Id:              v.ID,
 			Content:         v.Content,
 			Timestamp:       timestamp,
+			OriginTimestamp: v.Timestamp,
 			IsRemind:        v.IsRemind,
 			CanDel:          true,
 			IsTop:           v.Sort > 0,