Revert "db加一个type"

This reverts commit 62781316.

domain/model/cp_m/anniversary.go

@@ -3,7 +3,6 @@ package cp_m
 import (
 	"git.hilo.cn/hilo-common/domain"
 	"git.hilo.cn/hilo-common/resource/mysql"
-	"hilo-user/_const/enum/cp_e"
 	"time"
 )
 
@@ -11,7 +10,6 @@ import (
 type CpAnniversary struct {
 	mysql.Entity
 	CpId      mysql.ID
-	Type      cp_e.AnniversaryItemType
 	UserId1   mysql.ID
 	UserId2   mysql.ID
 	Content   string

route/cp_r/anniversary.go

@@ -4,8 +4,11 @@ import (
 	"git.hilo.cn/hilo-common/domain"
 	"git.hilo.cn/hilo-common/mycontext"
 	"github.com/gin-gonic/gin"
+	"hilo-user/_const/enum/cp_e"
 	"hilo-user/cv/cp_cv"
+	"hilo-user/cv/user_cv"
 	"hilo-user/domain/model/cp_m"
+	"hilo-user/domain/model/user_m"
 	"hilo-user/myerr/bizerr"
 	"hilo-user/req"
 	"hilo-user/resp"
@@ -91,10 +94,33 @@ func PageAnniversary(c *gin.Context) (*mycontext.MyContext, error) {
 	}
 	var response = make([]cp_cv.CvCpAnniversary, 0)
 	model := domain.CreateModelContext(myCtx)
+	cpRelation, exits := cp_m.GetCpRelation(model, userId)
+	if exits {
+		userIds := []uint64{cpRelation.UserId1, cpRelation.UserId2}
+		users, err := user_m.GetUserMapByIds(model, userIds)
+		if err != nil {
+			return myCtx, err
+		}
+		cpUserId := cpRelation.UserId2
+		if cpUserId == userId {
+			cpUserId = cpRelation.UserId1
+		}
+		userInfo := user_cv.UserToTiny(users[userId])
+		cpUserInfo := user_cv.UserToTiny(users[cpUserId])
+		response = append(response, cp_cv.CvCpAnniversary{
+			Type: cp_e.AnniversaryItemTypeAvatar,
+			CpInfo: &cp_cv.CvCpBase{
+				UserInfo:   *userInfo,
+				CpUserInfo: *cpUserInfo,
+			},
+			Timestamp: cpRelation.CreatedTime.Unix(),
+			CanDel:    false,
+		})
+	}
 	anniversary := cp_m.GetAllCpAnniversary(model, userId)
 	for _, v := range anniversary {
 		response = append(response, cp_cv.CvCpAnniversary{
-			Type:      v.Type,
+			Type:      cp_e.AnniversaryItemTypeNormal,
 			Id:        v.ID,
 			Content:   v.Content,
 			Timestamp: v.Timestamp,