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

cv/cp_cv/cp.go

@@ -8,3 +8,10 @@ type CvCp struct {
 	CpLevel         CvCpLevel           `json:"cpLevel"`         // cp等级
 	MyPrivilegeList []CvPrivilege       `json:"myPrivilegeList"` // 等级特权
 }
+
+// cp关系
+type CvCpRelation struct {
+	CpId     uint64 `json:"cpId"`
+	UserId   uint64 `json:"userId"`
+	CpUserId uint64 `json:"cpUserId"`
+}

route/router.go

@@ -56,6 +56,7 @@ func InitRouter() *gin.Engine {
 		innerUser.GET("/levels", wrapper(user_r.MGetUserLevels))
 		innerUser.GET("/bag/id", wrapper(user_r.GetUserBagId))
 		innerUser.GET("/cp", wrapper(user_r.GetUserCp))
+		innerUser.GET("/cpRelation", wrapper(user_r.GetUserCpRelation))
 	}
 	// 道具相关
 	innerProp := inner.Group("/prop")

route/user_r/inner.go

@@ -116,6 +116,7 @@ func GetUserCp(c *gin.Context) (*mycontext.MyContext, error) {
 	cpRelation, exists := cp_m.GetCpRelation(model, userId)
 	if !exists {
 		resp.ResponseOk(c, response)
+		return myContext, nil
 	}
 	var myPrivilegeList []cp_cv.CvPrivilege
 	level := cp_m.GetCpLevel(model, cpRelation.ID)
@@ -160,3 +161,35 @@ func GetUserCp(c *gin.Context) (*mycontext.MyContext, error) {
 	resp.ResponseOk(c, response)
 	return myContext, nil
 }
+
+// @Tags 用户-内部
+// @Summary 获取用户cp关系
+// @Param id query int true "用户id"
+// @Success 200 {object} cp_cv.CvCpRelation
+// @Router /inner/user/cpRelation [get]
+func GetUserCpRelation(c *gin.Context) (*mycontext.MyContext, error) {
+	myContext := mycontext.CreateMyContext(c.Keys)
+	var model = domain.CreateModelContext(myContext)
+	var req GetUserCpReq
+	if err := c.ShouldBindQuery(&req); err != nil {
+		return myContext, err
+	}
+	userId := req.Id
+	var response cp_cv.CvCpRelation
+	cpRelation, exists := cp_m.GetCpRelation(model, userId)
+	if !exists {
+		resp.ResponseOk(c, response)
+		return myContext, nil
+	}
+	cpUserId := cpRelation.UserId2
+	if cpUserId == userId {
+		cpUserId = cpRelation.UserId1
+	}
+	response = cp_cv.CvCpRelation{
+		CpId:     cpRelation.ID,
+		UserId:   userId,
+		CpUserId: cpUserId,
+	}
+	resp.ResponseOk(c, response)
+	return myContext, nil
+}