家族

domain/model/groupPower_m/family.go

@@ -87,7 +87,7 @@ func QuitFamily(model *domain.Model, userId, mgrId, familyId uint64) error {
 		return err
 	}
 	// log
-	log := &GroupPowerQuitLog{UserId: userId, MgrId: mgrId, GroupPowerId: familyId}
+	log := &GroupPowerQuitLog{UserId: userId, MgrId: mgrId, GroupPowerId: familyId, CreatedTime: time.Now()}
 	return model.Db.Create(log).Error
 }
 

domain/model/groupPower_m/group_power_apply.go

@@ -46,7 +46,7 @@ func GetGroupPowerApplyJoin(model *domain.Model, userId, familyId uint64) (*Grou
 }
 
 func OptGroupPowerApplyJoinById(model *domain.Model, id, mgrId uint64, optType int) error {
-	err := model.Db.Exec("update group_power_apply_join set is_accept = ?, mgr_id = ? where id=?", optType, mgrId, id).Error
+	err := model.Db.Exec("update group_power_apply_join set is_accept = ?, mgr_id = ? where id=? and is_accept = 0", optType, mgrId, id).Error
 	if err != nil {
 		return myerr.WrapErr(err)
 	}

myerr/bizerr/bizCode.go

@@ -89,6 +89,8 @@ var (
 	GroupPowerHaveChangeInfo    = myerr.NewBusinessCode(15016, "Setting failed", myerr.BusinessData{})                                                // 修改失败
 	GroupPowerHaveTooLong       = myerr.NewBusinessCode(15017, "too long", myerr.BusinessData{})                                                      // 长度太长
 	GroupPowerCannotRepeated    = myerr.NewBusinessCode(15018, "Cannot be repeated", myerr.BusinessData{})                                            // 不能重复
+	GroupPowerCannotQuit        = myerr.NewBusinessCode(15019, "Cannot quit", myerr.BusinessData{})                                                   // 不能退出
+	GroupPowerUserHaveNoJoin    = myerr.NewBusinessCode(15020, "User have no joined power", myerr.BusinessData{})                                     // 还未加入国家势力
 
 	TaskHasAward = myerr.NewBusinessCode(19001, "task has award", myerr.BusinessData{})
 

route/group_power_r/group_power.go

@@ -901,7 +901,7 @@ func GroupPowerApplyJoin(c *gin.Context) (*mycontext.MyContext, error) {
 
 // @Tags 家族
 // @Summary 审核加入家族申请
-// @Param userExtId formData string false "用户extId"
+// @Param userExtId formData string true "用户extId"
 // @Param type formData int true "1.通过，2.不通过"
 // @Success 200
 // @Router /v1/groupPower/apply/pass [post]
@@ -918,8 +918,15 @@ func GroupPowerApplyPass(c *gin.Context) (*mycontext.MyContext, error) {
 	if optType < 1 || optType > 2 {
 		return myContext, bizerr.InvalidParameter
 	}
-
+	userExtId := c.PostForm("userExtId")
+	if userExtId == "" {
+		return myContext, bizerr.InvalidParameter
+	}
 	model := domain.CreateModelContext(myContext)
+	optUser, err := user_c.GetUserByExternalId(model, userExtId)
+	if err != nil {
+		return myContext, err
+	}
 
 	// 判断是否加入了家族
 	gpU := groupPower_m.GroupPowerUser{UserId: userId}
@@ -935,7 +942,7 @@ func GroupPowerApplyPass(c *gin.Context) (*mycontext.MyContext, error) {
 		return myContext, bizerr.GroupPowerHaveNoPower
 	}
 	// 查找申请记录
-	apply, err := groupPower_m.GetGroupPowerApplyJoin(model, userId, myGroupPUser.GroupPowerId)
+	apply, err := groupPower_m.GetGroupPowerApplyJoin(model, optUser.ID, myGroupPUser.GroupPowerId)
 	if err != nil {
 		return myContext, err
 	}
@@ -1047,9 +1054,9 @@ func GroupPowerQuit(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		return myContext, err
 	}
-	quitType, err := strconv.Atoi(c.Query("type"))
+	quitType, err := strconv.Atoi(c.PostForm("type"))
 	if err != nil {
-		return myContext, err
+		return myContext, myerr.WrapErr(err)
 	}
 	if quitType < 1 || quitType > 2 {
 		return myContext, bizerr.InvalidParameter
@@ -1066,6 +1073,9 @@ func GroupPowerQuit(c *gin.Context) (*mycontext.MyContext, error) {
 		if groupPUser == nil {
 			return myContext, bizerr.GroupPowerHaveNoJoin
 		}
+		if groupPUser.Role == groupPower_e.GroupPowerUserRoleMgr {
+			return myContext, bizerr.GroupPowerCannotQuit
+		}
 		// 退出家族、log
 		err = model.Transaction(func(model *domain.Model) error {
 			return groupPower_m.QuitFamily(model, userId, userId, groupPUser.GroupPowerId)
@@ -1091,7 +1101,7 @@ func GroupPowerQuit(c *gin.Context) (*mycontext.MyContext, error) {
 		return myContext, bizerr.GroupPowerHaveNoPower
 	}
 	// 被踢人信息
-	userExtId := c.Query("userExtId")
+	userExtId := c.PostForm("userExtId")
 	if userExtId == "" {
 		return myContext, bizerr.InvalidParameter
 	}
@@ -1234,7 +1244,7 @@ func GroupPowerSetAdmin(c *gin.Context) (*mycontext.MyContext, error) {
 		return myContext, err
 	}
 	if optGroupPUser == nil {
-		return myContext, bizerr.GroupPowerHaveNoJoin
+		return myContext, bizerr.GroupPowerUserHaveNoJoin
 	}
 	// 目标身份
 	var targetRole groupPower_e.GroupPowerUserRole