_const/enum/groupPower_e/enum.go

@@ -22,6 +22,17 @@ const (
 	GroupPowerUserRoleUser GroupPowerUserRole = 1
 	//势力主
 	GroupPowerUserRoleMgr GroupPowerUserRole = 2
+	//势力管理员
+	GroupPowerUserRoleAdmin GroupPowerUserRole = 3
+)
+
+//国家势力排行榜类型
+type GroupPowerRankType = mysql.Type
+
+const (
+	GroupPowerRankTypeFamous GroupPowerRankType = 1
+	GroupPowerRankTypeActive GroupPowerRankType = 2
+	GroupPowerRankTypeCharm  GroupPowerRankType = 3
 )
 
 //国家势力日志操作类型

common/constDef.go

+package common
+
+type MsgIdType = uint
+type OnlineStatusType = uint
+type GroupRoleType = uint16
+type AddGroupResultType = uint
+
+const (
+	APP_KICKOFF_TIME = "2020-12-19"
+
+	DEFAULT_LANG        = "en"
+	DEFAULT_COUNTRY     = "KSA"
+	DEFAULT_NICK        = "Hilo No.%s"
+	DEFAULT_DESCRIPTION = "Welcome to Hilo"
+	DEFAULT_GROUP_NAME  = "Hilo Group NO.%s"
+
+	DefaultAvatarMan   = "hilo/manager/ea48b62d54a24a709de3c38702c89995.png"
+	DefaultAvatarWoman = "hilo/manager/ea48b62d54a24a709de3c38702c89995.png"
+	// 用户视频最低要求时长
+	BASIC_VIDEO_TIME = 1
+
+	// 公会用户视频最低要求时长
+	GUILD_USER_VIDEO_TIME = 15
+
+	STATUS_IN_USE = 1
+	STATUS_UNUSED = 2
+
+	// 公会用户是否打开通知
+	GuildUserNotifyOn  = 1
+	GuildUserNotifyOff = 2
+
+	// 平台
+	PlatformIOS      = 1
+	PlatformGOOGLE   = 2
+	PlatformEggPlant = 3 // 通过starchat回调的茄子充值
+	PlatformCheckout = 4
+
+	// 加、减
+	DIRECTION_ADD    = 1
+	DIRECTION_REDUCE = 2
+
+	// 操作类型
+	//发送礼物
+	OPERATE_TYPE_SENDGIFT = 1
+	//匹配条件
+	OPERATE_TYPE_MATCHCONDITION = 2
+	//建立融云会话
+	OPERATE_TYPE_SESSIONPAY = 3
+	//购买钻石
+	OPERATE_TYPE_BUYDIAMOND = 4
+	//接受礼物
+	OPERATE_TYPE_RECEIVEGIFT = 5
+	//注册
+	OPERATE_TYPE_REGISTER = 6
+	//平台赠送
+	OPERATE_TYPE_MGRSEND = 8
+
+	MATCH_CONFIRM_SUCCESS = 1
+	MATCH_CONFIRM_FAIL    = 2
+	MATCH_CONFIRM_TEMP    = 3
+
+	ACCEPT_MATCH_CONFIRM = 1
+	REFUSE_MATCH_CONFIRM = 2
+
+	// 视频通话是否达标
+	VIDEO_EFFECTIVE_YES = 1
+	VIDEO_EFFECTIVE_NO  = 2
+
+	// 最大用户相册数
+	USER_PHOTO_MAX = 9
+
+	// 上下架状态
+	SWITCH_ON = 1
+	SWITH_OFF = 0
+
+	// 群组角色
+	GROUP_VISITOR GroupRoleType = 0   // 游客
+	GROUP_MEMBER  GroupRoleType = 1   // 成员
+	GROUP_ADMIN   GroupRoleType = 10  // 管理员
+	GROUP_MANAGER GroupRoleType = 50  // 经理
+	GROUP_OWNER   GroupRoleType = 100 // owner
+
+	ROOM_PASSWORD_LENGTH     = 4
+	CREATE_GROUP_MAX_ATTEMPT = 10
+
+	// 在线状态
+	IM_STATUS_OFF_LINE     OnlineStatusType = 0
+	IM_STATUS_PUSH_ON_LINE OnlineStatusType = 1
+	IM_STATUS_ON_LINE      OnlineStatusType = 2
+
+	MSG_ID_GROUP_NAME         MsgIdType = 101
+	MSG_ID_GROUP_INTRODUCTION MsgIdType = 102
+	MSG_ID_GROUP_NOTIFICATION MsgIdType = 103
+	MSG_ID_GROUP_WELCOME      MsgIdType = 104
+	MSG_ID_GROUP_INVITE       MsgIdType = 105
+	MSG_ID_GROUP_LEAVE_POWER  MsgIdType = 106
+	MSG_ID_ALL_GROUP_ROCKET   MsgIdType = 107
+	MSG_ID_ROOM_MEADAL        MsgIdType = 108
+	MSG_ID_VIDEO_PUSH_TITITLE MsgIdType = 109
+	MSG_ID_VIDEO_PUSH_CONTENT MsgIdType = 110
+	MSG_ID_REPEAT_ACCOUNT     MsgIdType = 111
+	MSG_ID_USER_TRANSFER      MsgIdType = 114
+	MSG_ID_NO_POWER_TO_SVIP6  MsgIdType = 115 // 不能对svip6做某些动作
+	// ps:116-138 在hilo-finance定义了!
+	MSG_ID_NOT_FAMILY_MEMBER   MsgIdType = 165 // 非家族成员
+	MSG_ID_DEALER_CAN_NOT_SOLE MsgIdType = 166 // 此用户已有家族代理，不能出售钻石
+	MSG_ID_BUY_FROM_FAMILY     MsgIdType = 167 // 请向本家族代理购买钻石
+	MSG_ID_NEED_JOIN_FAMILY    MsgIdType = 168 // 请加入代理的家族后进行购买
+
+	ADD_GROUP_FAILED    AddGroupResultType = 0
+	ADD_GROUP_DONE      AddGroupResultType = 1
+	ADD_GROUP_DUPLICATE AddGroupResultType = 2
+	ADD_GROUP_PENDING   AddGroupResultType = 3
+
+	SETTING_OFFICIAL   = 1
+	SETTING_CUSTOMIZED = 2
+)
+
+var USER_QPS_DEFAULT_MAX int64 = 15
+var HEART_VALUE_MAX uint32 = 2000
+var BUILDBOARD_SMALL_SIZE = 30
+var BUILDBOARD_SIZE = 50
+
+var GROUP_CREATE_LIMIT = 1
+var GROUP_NAME_LENGTH_LIMIT = 30
+var GROUP_INTRODUCTION_LENGTH_LIMIT = 500
+var GROUP_NOTIFICATION_LENGTH_LIMIT = 150
+
+var MAX_BEAUTIFUL_CODE_LENGTH = 8
+var GROUP_DEFAULT_CODE_LENGTH uint16 = 8
+var GROUP_DEFAULT_JOIN_LIMIT uint = 200
+var GROUP_VIP_JOIN_LIMIT uint = 500
+var GROUP_NOBLE4_JOIN_LIMIT uint = 1000
+
+var GROUP_MANAGER_LIMIT uint = 30
+var GROUP_ADMIN_LIMIT uint = 50
+var GROUP_ROLE_VIEW_LIMIT = 10
+var GROUP_ROLE_PERSONAL_VIEW_LIMIT = 5
+
+var GROUP_RECOMMEND_SIZE = 5
+
+var IM_INVALID_USER = "@TLS#NOT_FOUND"
+
+// TIM相关常量
+const (
+	SYNC_TO_SENDER   = 1
+	NOSYNC_TO_SENDER = 2
+
+	TAG_PROFILE_IM_LEVEL = "Tag_Profile_IM_Level"
+	TAG_PROFILE_IM_NICK  = "Tag_Profile_IM_Nick"
+	TAG_PROFILE_IM_IMAGE = "Tag_Profile_IM_Image"
+	TAG_PROFILE_IM_HILO  = "Tag_Profile_Custom_Hilo"
+)
+
+// 群组内游戏相关
+const (
+	GROUP_DICE_NUM_DEFAULT = 5
+	GROUP_DICE_NUM_MAX     = 5
+)
+
+var PAY_TEST_USERS = []uint64{11, 21, 41, 71, 151, 251, 291, 881, 1041, 4411, 951, 24091}
+
+var ROCKET_STAGE_NUM uint16 = 3
+var ROCKET_STAGE_CHANGE_THRESHOLD = 10
+var ROCKET_SHOW_DURATION = 10
+
+// RocketAwardType
+const (
+	ROCKET_AWARD_GUEST_DIAMOND = 0 // 观众分到小额钻石
+	ROCKET_AWARD_PROPERTY      = 1 // TOP6抽到的座驾
+	ROCKET_AWARD_HEADDRESS     = 2 // TOP6抽到的头饰
+	ROCKET_AWARD_DIAMOND       = 3 // TOP6抽到的钻石
+)
+
+const DefaultMinimalVersionAndroid = 100
+const DefaultMinimalVersionIOS = 100
+
+const DefaultMsgParallelSize = 20
+
+const OldGroupNamePrefix = "@TGS#"
+const NewGroupNamePrefix = "HTGS#"
+const OverseaGroupNamePrefix = NewGroupNamePrefix + "a"
+
+const (
+	SendSmsCodeIpMaxHourTimes       = 20
+	SendSmsCodeImeiMaxHourTimes     = 10
+	SendSmsCodePhoneMaxHourTimes    = 5
+	SendSmsCodeUserMaxHourTimes     = 3
+	SendSmsCodeLen                  = 6    // 验证码长度
+	SendSmsCodeMaxCheckTimes        = 3    // 验证码最大校验次数
+	SendSmsCodeNoUserIdMaxHourTimes = 1000 // 没有传userId调用发短信，5分钟最大次数
+
+	CallbackCheckoutPaySucceed = "payment_captured" // checkout回调支付成功
+
+	// ranking
+	RankingDay   = "day"
+	RankingWeek  = "week"
+	RankingMonth = "month"
+	RankingAll   = "all"
+	// ranking module
+	RankingModulePinkDiamond = "pinkDiamond"
+
+	// giftwall 礼物墙
+	GiftWallInitNum        = 15000 // 礼物墙初始化数量
+	GiftWallInitOnceSetNum = 500   // 礼物墙初始化，一次插入的数量
+	GiftWallStartReduceNum = 20000 // 礼物墙触发清理逻辑数量
+	GiftWallReduceNum      = 3000  // 礼物墙触发清理逻辑，清理的数量
+)

common/utils.go

+package common
+
+import (
+	"git.hilo.cn/hilo-common/resource/config"
+	"strings"
+)
+
+// 去除slice中的重复元素
+func UniqueSliceUInt64(sliceIn []uint64) []uint64 {
+	sliceOut := make([]uint64, 0, len(sliceIn))
+	m := make(map[uint64]struct{}, len(sliceIn))
+	for _, i := range sliceIn {
+		if _, ok := m[i]; !ok {
+			m[i] = struct{}{}
+			sliceOut = append(sliceOut, i)
+		}
+	}
+	return sliceOut
+}
+
+// 补全url，区分处理oss和aws两种情况
+func MakeFullUrl(url string) string {
+	if strings.HasPrefix(url, config.GetConfigOss().OSS_CDN) || strings.HasPrefix(url, config.GetConfigAws().AWS_CDN) {
+		return url
+	} else if strings.HasPrefix(url, "nextvideo/") {
+		return config.GetConfigOss().OSS_CDN + url
+	} else if strings.HasPrefix(url, config.GetConfigAws().AWS_DIR) {
+		return config.GetConfigAws().AWS_CDN + url
+	} else {
+		return url
+	}
+}
+
+func PageNext(total int64, pageIndex, pageSize int) (int, bool) {
+	var nextIdx int
+	var hasNext bool
+	if total > int64(pageIndex*pageSize) {
+		hasNext = true
+		nextIdx = pageIndex + 1
+	}
+	return nextIdx, hasNext
+}

common/utime/utime.go

+package utime
+
+import (
+	"github.com/jinzhu/now"
+	"time"
+)
+
+const (
+	Day         = 86400
+	Layout      = "2006-01-02 15:04:05"
+	LayoutDay   = "2006-01-02"
+	LayoutDay2  = "20060102"
+	LayoutMonth = "2006-01"
+)
+
+// 获取时间所在周的第一天（周一) 00:00:00，和最后一天（周日）23:59:59
+func WeekStartEnd(date time.Time) (start, end time.Time) {
+	w := 0
+	week := date.Weekday()
+	if week == time.Sunday {
+		w = 7
+	} else {
+		w = int(week)
+	}
+	startTmp := date.AddDate(0, 0, -w+1)
+	endTmp := date.AddDate(0, 0, 7-w)
+
+	start = time.Date(startTmp.Year(), startTmp.Month(), startTmp.Day(), 0, 0, 0, 0, startTmp.Location())
+	end = time.Date(endTmp.Year(), endTmp.Month(), endTmp.Day(), 23, 59, 59, 999, endTmp.Location())
+	return
+}
+
+// 当天开始结束
+func DayStartEnd(date time.Time) (start, end time.Time) {
+	start = time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
+	end = time.Date(date.Year(), date.Month(), date.Day(), 23, 59, 59, 999, date.Location())
+	return
+}
+
+// 获取时间所在月的第一天（1号) 00:00:00，和最后一天23:59:59
+func MonthStartEnd(date time.Time) (start, end time.Time) {
+	start = time.Date(date.Year(), date.Month(), 1, 0, 0, 0, 0, date.Location())
+	lastDay := now.New(start).EndOfMonth().Day()
+	end = time.Date(date.Year(), date.Month(), lastDay, 23, 59, 59, 999999999, date.Location())
+	return
+}
+
+// 增加年/月
+// 因为golang原生的Time.AddDate增加月份的时候有bug
+func AddDate(t time.Time, years int, months int) time.Time {
+	year, month, day := t.Date()
+	hour, min, sec := t.Clock()
+
+	// firstDayOfMonthAfterAddDate: years 年，months 月后的 那个月份的1号
+	firstDayOfMonthAfterAddDate := time.Date(year+years, month+time.Month(months), 1,
+		hour, min, sec, t.Nanosecond(), t.Location())
+	// firstDayOfMonthAfterAddDate 月份的最后一天
+	lastDay := now.New(firstDayOfMonthAfterAddDate).EndOfMonth().Day()
+
+	// 如果 t 的天 > lastDay，则设置为lastDay
+	// 如：t 为 2020-03-31 12:00:00 +0800，增加1个月，为4月31号
+	// 但是4月没有31号，则设置为4月最后一天lastDay（30号）
+	if day > lastDay {
+		day = lastDay
+	}
+
+	return time.Date(year+years, month+time.Month(months), day,
+		hour, min, sec, t.Nanosecond(), t.Location())
+}

cv/group_cv/group.go

@@ -43,12 +43,12 @@ type GroupBasicInfo struct {
 	//1:5人 2：10人
 	MicNumType int `json:"micNumType"`
 	// N天内的进入用户数量（重复进入去重，实时）
-	GroupInUserDuration int64                 `json:"groupInUserDuration"`
-	GroupMedals         []medal_cv.PicElement `json:"groupMedals"`    // 群勋章
-	TouristMic          uint8                 `json:"touristMic"`     // 游客是否能上麦
-	TouristSendMsg      uint8                 `json:"touristSendMsg"` // 游客是否能发言
-	TouristSendPic      uint8                 `json:"touristSendPic"` // 游客是否能发图片
-	MemberFee           uint64                `json:"memberFee"`      // 加入群组会员需要的黄钻
+	GroupInUserDuration int64                 `json:"groupInUserDuration"` // 群热度
+	GroupMedals         []medal_cv.PicElement `json:"groupMedals"`         // 群勋章
+	TouristMic          uint8                 `json:"touristMic"`          // 游客是否能上麦
+	TouristSendMsg      uint8                 `json:"touristSendMsg"`      // 游客是否能发言
+	TouristSendPic      uint8                 `json:"touristSendPic"`      // 游客是否能发图片
+	MemberFee           uint64                `json:"memberFee"`           // 加入群组会员需要的黄钻
 }
 
 type MemberListInfo struct {
@@ -404,6 +404,168 @@ func BuildJoinedGroupInfo(myService *domain.Service, myUserId uint64, groupIds [
 	return result, len(groupInfo), nil
 }
 
+func BuildPopularGroupInfo(model *domain.Model, myUserId uint64, groupInfo []*group_m.GroupInfo) ([]*PopularGroupInfo, error) {
+	groupIds := make([]string, 0, len(groupInfo))
+	for _, v := range groupInfo {
+		groupIds = append(groupIds, v.ImGroupId)
+	}
+
+	// roomMicUserMap不影响排序
+	roomMicUserMap, err := group_m.BatchGetAllMicUser(model, groupIds)
+	if err != nil {
+		return nil, err
+	}
+	uids := make([]uint64, 0)
+	micUsersMap := make(map[string][]uint64, 0)
+	for _, v := range groupInfo {
+		micUsersMap[v.ImGroupId] = make([]uint64, 0)
+
+		if len(v.Password) <= 0 {
+			// 密码群不显示麦上头像
+			u := roomMicUserMap[v.ImGroupId]
+			if len(u) >= 4 {
+				micUsersMap[v.ImGroupId] = u[0:4]
+			} else if len(u) > 0 {
+				micUsersMap[v.ImGroupId] = u
+			}
+			uids = append(uids, micUsersMap[v.ImGroupId]...)
+		}
+	}
+
+	uids = utils.UniqueSliceUInt64(uids)
+	userTiny, err := user_cv.GetUserTinyMap(uids)
+	if err != nil {
+		return nil, err
+	}
+	roomCount, err := group_m.BatchGetRoomCount(model, groupIds)
+	if err != nil {
+		return nil, err
+	}
+
+	countryInfo, err := res_c.GetCountryIconMap(model)
+	if err != nil {
+		return nil, err
+	}
+
+	supportLevels, err := group_s.NewGroupService(model.MyContext).GetWeekMaxSupportLevelMap()
+	if err != nil {
+		return nil, err
+	}
+
+	visitCount, err := group_m.BatchGetRoomVisitCount(model.Log, groupIds)
+	if err != nil {
+		return nil, err
+	}
+
+	roomEnterTime, err := room_c.GetUserRoomVisit(myUserId)
+	if err != nil {
+		return nil, err
+	}
+	model.Log.Infof("BuildPopularGroupInfo, roomEnterTime: %v", roomEnterTime)
+
+	// 排序优先级V8.0版本
+	sort.Slice(groupIds, func(i, j int) bool {
+		gi := groupIds[i]
+		gj := groupIds[j]
+		return roomEnterTime[gi] > roomEnterTime[gj] ||
+			roomEnterTime[gi] == roomEnterTime[gj] && visitCount[gj] > visitCount[gj] ||
+			roomEnterTime[gi] == roomEnterTime[gj] && visitCount[gj] == visitCount[gj] && i >= j
+	})
+
+	result := make([]*PopularGroupInfo, 0)
+	owners := make([]uint64, 0)
+	for _, v := range groupInfo {
+		owners = append(owners, v.Owner)
+	}
+	powerIds, powerNames, err := group_power_cv.BatchGetGroupPower(model.Db, owners)
+	if err != nil {
+		return nil, err
+	}
+	groupMedals, err := group_m.BatchGetMedals(model.Db, groupIds)
+	if err != nil {
+		return nil, err
+	}
+	resMedal, err := res_m.MedalGetAllMap(model.Db)
+	if err != nil {
+		return nil, err
+	}
+
+	rr := rocket_m.RocketResult{}
+	maxStageMap, err := rr.GetMaxStage(model.Db, groupIds)
+	if err != nil {
+		return nil, err
+	}
+	// 正在进行的游戏
+	games := game_m.GetNotEndGamesMap(model)
+
+	for _, v := range groupInfo {
+		g := v
+		i := v.ImGroupId
+		micUsers := make([]user_cv.CvUserTiny, 0)
+		for _, j := range micUsersMap[i] {
+			micUsers = append(micUsers, userTiny[j])
+		}
+
+		var maxStage *uint16 = nil
+		if s, ok := maxStageMap[i]; ok {
+			maxStage = &s
+		}
+
+		medals := make([]medal_cv.PicElement, 0)
+		if m, ok := groupMedals[i]; ok {
+			for _, j := range m {
+				mId := uint32(j)
+				if e, ok := resMedal[mId]; ok {
+					medals = append(medals, medal_cv.PicElement{
+						PicUrl: e.PicUrl,
+					})
+				}
+			}
+		}
+		// 补上房间流水勋章
+		var pe *medal_cv.PicElement
+		_, pe, err = medal_cv.GetGroupConsumeMedal(model, i)
+		if err != nil {
+			model.Log.Infof("BuildPopularGroupInfo: GetGroupConsumeMedal: %s", err.Error())
+		} else if pe != nil {
+			medals = append(medals, medal_cv.PicElement{PicUrl: pe.PicUrl})
+		}
+
+		var password *string = nil
+		if len(g.Password) > 0 && g.Owner != myUserId {
+			emptyStr := ""
+			password = &emptyStr
+		}
+
+		result = append(result, &PopularGroupInfo{
+			GroupInfo: GroupInfo{
+				GroupBasicInfo: GroupBasicInfo{
+					GroupId:             g.TxGroupId,
+					Name:                g.Name,
+					Notification:        g.Notification,
+					Introduction:        g.Introduction,
+					FaceUrl:             g.FaceUrl,
+					Code:                g.Code,
+					CountryIcon:         countryInfo[g.Country],
+					Password:            password,
+					SupportLevel:        supportLevels[i],
+					GroupInUserDuration: visitCount[i],
+					MicNumType:          int(g.MicNumType),
+					GroupMedals:         medals,
+				},
+				HasOnMic:       len(micUsers) > 0,
+				GroupPowerId:   powerIds[g.Owner],
+				GroupPowerName: powerNames[g.Owner],
+			},
+			MicUsers:      micUsers,
+			RoomUserCount: uint(roomCount[i]),
+			MaxStage:      maxStage,
+			GameTypes:     games[g.TxGroupId],
+		})
+	}
+	return result, nil
+}
+
 //检查群组中是否有有人在麦上,返回存在的Set[imGroupId]
 func CheckMicHasUserByGroup(groupIds []string) (map[string]struct{}, error) {
 	groupMap := map[string]struct{}{}

cv/group_power_cv/groupPower.go

@@ -16,6 +16,7 @@ import (
 	"hilo-group/cv/user_cv"
 	"hilo-group/domain/model/groupPower_m"
 	"hilo-group/domain/model/group_m"
+	"hilo-group/domain/model/user_m"
 	"hilo-group/myerr"
 	"sort"
 	"strconv"
@@ -639,3 +640,53 @@ func GetAllPowerDiamond(period string) (map[string]string, error) {
 	key := redis_key.GetPrefixGroupPowerDiamond(period)
 	return redisCli.GetRedis().HGetAll(context.Background(), key).Result()
 }
+
+type GroupPowerInfo struct {
+	Info    *GroupPower        `json:"info"`
+	Members []*GroupPowerUser  `json:"members"`
+	Stars   []*GroupPowerStart `json:"stars"`
+}
+
+type GroupPower struct {
+	Id          uint64    `json:"id"`
+	Name        mysql.Str `json:"name"`
+	Nameplate   mysql.Str `json:"nameplate"`          // 铭牌
+	Declaration mysql.Str `json:"declaration"`        // 宣言
+	Icon        mysql.Str `json:"icon"`               // 头像
+	Grade       mysql.Num `json:"grade" gorm:"-"`     // 等级
+	Exp         mysql.Num `json:"exp" gorm:"-"`       // 当前经验值
+	NextExp     mysql.Num `json:"nextExp" gorm:"-"`   // 升到下一级需要的经验值
+	GradeName   mysql.Str `json:"gradeName"`          // 等级称号
+	GradeMedal  mysql.Str `json:"gradeMedal"`         // 等级勋章图片
+	MemberNum   mysql.Num `json:"memberNum" gorm:"-"` // 当前人数
+	MemberMax   mysql.Num `json:"memberMax" gorm:"-"` // 最大人数
+}
+
+type GroupPowerUser struct {
+	User *user_m.UserTiny                `json:"user"`
+	Role groupPower_e.GroupPowerUserRole `json:"role"`
+}
+
+type GroupPowerStart struct {
+	User        *user_m.UserTiny                `json:"user"`
+	RankingType groupPower_e.GroupPowerRankType `json:"rankingType"`
+}
+
+type FamilyMemberDetail struct {
+	user_cv.CvUserExtend
+	Role groupPower_e.GroupPowerUserRole `json:"role"`
+}
+
+type FamilyApplyList struct {
+	User    *user_m.UserTiny `json:"user"`
+	Time    time.Time        `json:"time"`
+	Status  int8             `json:"status"`  // 0未操作，1已接受，2.已拒绝
+	MgrName string           `json:"mgrName"` // 管理员名称
+}
+
+type FamilyQuitList struct {
+	User     *user_m.UserTiny `json:"user"`
+	Time     time.Time        `json:"time"`
+	QuitType int8             `json:"status"`  // 1.主动退出 2.被踢出
+	MgrName  string           `json:"mgrName"` // 管理员名称
+}

domain/cache/user_c/user.go

@@ -6,10 +6,12 @@ import (
 	redisV8 "github.com/go-redis/redis/v8"
 	"github.com/jinzhu/copier"
 	"hilo-group/_const/redis_key/user_k"
+	"hilo-group/common"
 	"hilo-group/domain/cache"
 	"hilo-group/domain/model/user_m"
 	"hilo-group/myerr"
 	"hilo-group/myerr/bizerr"
+	"time"
 )
 
 // 获取用户简要信息
@@ -96,10 +98,11 @@ func ToUserIdByCode(model *domain.Model, code mysql.Str) (mysql.ID, error) {
 // 顺手缓存code->userId
 // param user: 已经在上层获取的db User结构
 func cacheUserTiny(model *domain.Model, user *user_m.User) error {
-	userTiny := new(user_m.UserTiny)
-	if err := copier.Copy(userTiny, user); err != nil {
-		return err
-	}
+	userTiny := ToUserTinyBy(user)
+	//userTiny := new(user_m.UserTiny)
+	//if err := copier.Copy(userTiny, user); err != nil {
+	//	return err
+	//}
 	// cache externalId->userId
 	if err := model.Redis.SetEX(model.Context, user_k.GetExternalIdToUidKey(user.ExternalId), user.ID, cache.GetDefaultTTL()).Err(); err != nil {
 		return err
@@ -113,3 +116,89 @@ func cacheUserTiny(model *domain.Model, user *user_m.User) error {
 	}
 	return nil
 }
+
+// 获取用户简要信息
+// param userIds 用户id列表
+func GetUserTinyMap(model *domain.Model, userIds []mysql.ID, isDefAvatar bool) (map[mysql.ID]*user_m.UserTiny, error) {
+	redisNoIds := make([]mysql.ID, 0)
+	res := make(map[mysql.ID]*user_m.UserTiny)
+	for _, id := range userIds {
+		userTiny := new(user_m.UserTiny)
+		key := user_k.GetUserTinyKey(id)
+		err := cache.GetJSON(model, key, userTiny)
+		if err != nil && err != redisV8.Nil {
+			return nil, err
+		}
+		if err == redisV8.Nil {
+			redisNoIds = append(redisNoIds, id)
+		} else if userTiny.ID > 0 {
+			res[id] = userTiny
+		}
+	}
+	// 从db中读
+	users, err := user_m.GetUsers(model, redisNoIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, u := range users {
+		userTiny := ToUserTinyBy(u)
+		err = cacheUserTiny(model, u)
+		if err != nil {
+			return nil, err
+		}
+		res[userTiny.ID] = userTiny
+	}
+	if isDefAvatar {
+		for _, v := range res {
+			if len(v.Avatar) <= 0 {
+				if v.Sex == mysql.MAN {
+					v.Avatar = common.MakeFullUrl(common.DefaultAvatarMan)
+				} else if v.Sex == mysql.WOMAN {
+					v.Avatar = common.MakeFullUrl(common.DefaultAvatarWoman)
+				}
+			}
+		}
+	}
+	return res, nil
+}
+
+func ToUserTinyBy(user *user_m.User) *user_m.UserTiny {
+	return &user_m.UserTiny{
+		ID:           user.ID,
+		Avatar:       IfLogoutStr(IfLogout(user.LogoutTime), "", user.Avatar),
+		ExternalId:   user.ExternalId,
+		Nick:         IfLogoutNick(IfLogout(user.LogoutTime), user.Code, user.Nick),
+		Sex:          user.Sex,
+		Code:         user.Code,
+		Country:      user.Country,
+		CountryIcon:  user.CountryIcon,
+		IsPrettyCode: user.IsPrettyCode(),
+		IsLogout:     IfLogout(user.LogoutTime),
+		Birthday:     BirthdayToUint64(&user.Birthday),
+	}
+}
+
+func IfLogout(logoutTime int64) bool {
+	return logoutTime > 0 && time.Now().Unix() > logoutTime
+}
+
+func BirthdayToUint64(birthday *mysql.Timestamp) *uint64 {
+	if *birthday == 0 {
+		return nil
+	}
+	return (*uint64)(birthday)
+}
+
+func IfLogoutStr(condition bool, trueVal, falseVal string) string {
+	if condition {
+		return trueVal
+	}
+	return falseVal
+}
+
+func IfLogoutNick(condition bool, code string, nick string) string {
+	if condition {
+		return "Hilo No." + code
+	}
+	return nick
+}

domain/model/diamond_m/dealer.go

+package diamond_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mylogrus"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-group/common"
+	"hilo-group/myerr"
+)
+
+type DiamondDealer struct {
+	mysql.Entity
+	UserId        uint64
+	Diamond       uint32
+	Wechat        string
+	Whatsapp      string
+	Contact       string
+	Status        int
+	HasInvite     int
+	IsFamilyAgent int8
+}
+
+func (dealer *DiamondDealer) Save(db *gorm.DB) error {
+	if dealer.ID > 0 {
+		db = db.Omit("diamond", "status")
+	} else {
+		dealer.Status = common.SWITCH_ON
+	}
+	return db.Save(dealer).Error
+}
+
+func (dealer *DiamondDealer) Get(db *gorm.DB) error {
+	return db.Where(dealer).First(dealer).Error
+}
+
+func IsDiamondDealer(db *gorm.DB, userId uint64) (bool, error) {
+	dd := DiamondDealer{UserId: userId, Status: common.SWITCH_ON}
+	if err := dd.Get(db); err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return false, nil
+		} else {
+			return false, err
+		}
+	}
+	return true, nil
+}
+
+// 是否是家族代理
+func IsFamilyDiamondDealer(db *gorm.DB, userId uint64) (bool, error) {
+	dd := DiamondDealer{UserId: userId, Status: common.SWITCH_ON, IsFamilyAgent: 1}
+	if err := dd.Get(db); err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return false, nil
+		} else {
+			return false, err
+		}
+	}
+	return true, nil
+}
+
+func GetDiamondDealer(db *gorm.DB, userId uint64) (*DiamondDealer, error) {
+	dd := &DiamondDealer{UserId: userId, Status: common.SWITCH_ON}
+	if err := dd.Get(db); err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	return dd, nil
+}
+
+func (dealer *DiamondDealer) GetAll(db *gorm.DB, status *uint8) ([]DiamondDealer, error) {
+	rows := make([]DiamondDealer, 0)
+	if status == nil {
+		if err := db.Where(dealer).Find(&rows).Error; err != nil {
+			return nil, err
+		}
+	} else if err := db.Where(dealer).Where("status = ?", *status).Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func (dealer *DiamondDealer) Remove(db *gorm.DB) (int64, error) {
+	result := db.Where(dealer).Delete(&DiamondDealer{})
+	return result.RowsAffected, result.Error
+}
+
+func (dealer *DiamondDealer) SafeReduceDiamond(db *gorm.DB, diamond uint32) (int64, error) {
+	result := db.Model(&DiamondDealer{}).Where(dealer).Where("diamond >= ?", diamond).UpdateColumn("diamond", gorm.Expr("diamond - ?", diamond))
+	return result.RowsAffected, result.Error
+}
+
+func (dealer *DiamondDealer) AddDiamond(db *gorm.DB, diamond uint32) (int64, error) {
+	result := db.Model(&DiamondDealer{}).Where(dealer).Where("status = ?", common.SWITCH_ON).UpdateColumn("diamond", gorm.Expr("diamond + ?", diamond))
+	return result.RowsAffected, result.Error
+}
+
+func (dealer *DiamondDealer) SetStatus(db *gorm.DB, status uint8) error {
+	return db.Model(&DiamondDealer{}).Where(dealer).Update("status", status).Error
+}
+
+type DealerTransferDetail struct {
+	mysql.Entity
+	DealerId   uint64
+	ReceiverId uint64
+	Diamond    uint32
+	Dollar     uint
+}
+
+func (dtd *DealerTransferDetail) Create(db *gorm.DB) error {
+	return db.Create(dtd).Error
+}
+
+func (dfd *DealerTransferDetail) Find(db *gorm.DB, offset, limit int) ([]DealerTransferDetail, error) {
+	rows := make([]DealerTransferDetail, 0)
+	if err := db.Where(dfd).Order("created_time DESC").Offset(offset).Limit(limit).Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func (dfd *DealerTransferDetail) CountByDealer(db *gorm.DB, dealerIds []uint64) (map[uint64]uint, error) {
+	type summary struct {
+		DealerId uint64
+		C        uint
+	}
+	rows := make([]summary, 0)
+	if err := db.Model(&DealerTransferDetail{}).Where("dealer_id IN ?", dealerIds).
+		Select("dealer_id, COUNT(0) AS c").Group("dealer_id").Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	result := make(map[uint64]uint, 0)
+	for _, i := range rows {
+		result[i.DealerId] = i.C
+	}
+	return result, nil
+}
+
+func (dfd *DealerTransferDetail) Sum(db *gorm.DB) (uint, uint32, uint, error) {
+	type summary struct {
+		C       uint
+		Diamond uint32
+		Dollar  uint
+	}
+	s := summary{}
+	if err := db.Model(&DealerTransferDetail{}).Where(dfd).
+		Select("COUNT(0) AS c, SUM(diamond) AS diamond, SUM(dollar) AS dollar").First(&s).Error; err != nil {
+		return 0, 0, 0, err
+	}
+	return s.C, s.Diamond, s.Dollar, nil
+}
+
+type DealerChargeDetail struct {
+	mysql.Entity
+	DealerId      uint64
+	MgrId         uint64
+	Diamond       uint32
+	Dollar        uint
+	PaymentMethod string
+	Type          uint8
+	Money         float32 `json:"money"`    // 支付的货币数值
+	Currency      string  `json:"currency"` // 支付货币
+	GoodsId       string  `json:"goodsId"`  // 充值钻石套餐id/商品id
+}
+
+func (dcd *DealerChargeDetail) Create(db *gorm.DB) error {
+	return db.Create(dcd).Error
+}
+
+type DealerCountry struct {
+	DealerId uint64
+	Country  string
+}
+
+func (dc *DealerCountry) Find(db *gorm.DB) ([]DealerCountry, error) {
+	rows := make([]DealerCountry, 0)
+	if err := db.Where(dc).Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func (dc *DealerCountry) Delete(db *gorm.DB) error {
+	return db.Where(dc).Delete(&DealerCountry{}).Error
+}
+
+func (dc *DealerCountry) BatchInsert(db *gorm.DB, dealerId uint64, countries []string) error {
+	rows := make([]DealerCountry, 0)
+	for _, i := range countries {
+		rows = append(rows, DealerCountry{
+			DealerId: dealerId,
+			Country:  i,
+		})
+	}
+	return db.Create(&rows).Error
+}
+
+// 活动排行榜黑名单 获取所有已经上架代理币商的群组id
+func GetAllValidActivityBlackImGroupIds(model *domain.Model) []mysql.Str {
+	//return []mysql.Str{"HTGS#a88745892", "@TGS#3UW6RFSIX"}
+	var imGroupIds []mysql.Str
+	subQuery := model.Db.WithContext(model).Model(DiamondDealer{}).Where("status = 1").Select("user_id")
+	if err := model.Db.WithContext(model).Table("group_info").Select("im_group_id").Where("owner in (?)", subQuery).Scan(&imGroupIds).Error; err != nil {
+		mylogrus.MyLog.Errorf("GetAllValidActivityBlackImGroupIds fail:%v", err)
+	}
+	imGroupIds = append(imGroupIds, "HTGS#a88745892", "@TGS#3UW6RFSIX")
+	return imGroupIds
+}

domain/model/groupPower_m/family.go

+package groupPower_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-group/_const/enum/groupPower_e"
+	"hilo-group/common"
+	"hilo-group/common/utime"
+	"hilo-group/myerr"
+	"hilo-group/myerr/bizerr"
+	"time"
+)
+
+type GroupPowerGrade struct {
+	GroupPowerId uint64    `json:"group_power_id"`
+	Exp          int64     `json:"exp"`
+	Grade        int32     `json:"grade"`
+	ExpireAt     time.Time `json:"expire_at"`
+}
+
+type GroupPowerQuitLog struct {
+	Id           uint64    `json:"id"`
+	UserId       uint64    `json:"user_id"`
+	MgrId        uint64    `json:"mgr_id"`
+	CreatedTime  time.Time `json:"created_time"`
+	GroupPowerId uint64    `json:"group_power_id"`
+}
+
+func (this *GroupPower) Get(model *domain.Model) (*GroupPower, error) {
+	group := new(GroupPower)
+	err := model.Db.Where(this).First(&group).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		}
+		return nil, err
+	}
+	grade := new(GroupPowerGrade)
+	err = model.Db.Model(&GroupPowerGrade{}).Where("group_power_id=? and expire_at > ?", this.ID, time.Now().Format(utime.Layout)).First(&grade).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if grade.GroupPowerId > 0 {
+		group.Grade = mysql.Num(grade.Grade)
+		group.Exp = mysql.Num(grade.Exp)
+		group.NextExp = mysql.Num(grade.Exp)
+	}
+	return group, nil
+}
+
+func (gpu *GroupPowerUser) GetBy(model *domain.Model, pageSize, pageIndex int) ([]*GroupPowerUser, int64, int, bool, error) {
+	rows := make([]*GroupPowerUser, 0)
+	db := model.Db.Model(GroupPowerUser{}).Where(gpu).Order("field(`role`, 2, 3, 1)")
+	var count int64
+	err := db.Count(&count).Error
+	if err != nil {
+		return nil, 0, 0, false, err
+	}
+	err = db.Limit(pageSize).Offset(pageIndex - 1).Find(&rows).Error
+	if err != nil {
+		return nil, 0, 0, false, err
+	}
+	nextPageIndex, hasNextPage := common.PageNext(count, pageIndex, pageSize)
+	return rows, count, nextPageIndex, hasNextPage, nil
+}
+
+func (gpu *GroupPowerUser) GetGroupPowerUser(model *domain.Model) (*GroupPowerUser, error) {
+	rows := make([]*GroupPowerUser, 0)
+	err := model.Db.Where(gpu).Find(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+	if len(rows) == 0 {
+		return nil, nil
+	}
+	return rows[0], nil
+}
+
+func (gpu *GroupPowerUser) Create(db *gorm.DB) error {
+	return db.Create(gpu).Error
+}
+
+func QuitFamily(model *domain.Model, userId, mgrId, familyId uint64) error {
+	err := model.Db.Exec("delete from group_power_user where group_power_id = ? and user_id = ?", familyId, userId).Error
+	if err != nil {
+		return err
+	}
+	// log
+	log := &GroupPowerQuitLog{UserId: userId, MgrId: mgrId, GroupPowerId: familyId, CreatedTime: time.Now()}
+	return model.Db.Create(log).Error
+}
+
+func GroupPowerQuitList(model *domain.Model, familyId uint64, pageSize, pageIndex int) ([]*GroupPowerQuitLog, int, bool, error) {
+	rows := make([]*GroupPowerQuitLog, 0)
+	db := model.Db.Model(GroupPowerQuitLog{}).Where("group_power_id = ?", familyId).Order("created_time desc")
+	var count int64
+	err := db.Count(&count).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	err = db.Limit(pageSize).Offset(pageIndex - 1).Find(&rows).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	nextIdx, hasNext := common.PageNext(count, pageIndex, pageSize)
+	return rows, nextIdx, hasNext, nil
+}
+
+func UpdateFamilyAdmin(model *domain.Model, userId, familyId uint64, role groupPower_e.GroupPowerUserRole) error {
+	err := model.Db.Exec("update group_power_user set role = ? where group_power_id = ? and user_id = ?", role, familyId, userId).Error
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func UpdateFamily(model *domain.Model, familyId uint64, name, nameplate, declaration, icon string) error {
+	if familyId == 0 || (name == "" && nameplate == "" && declaration == "" && icon == "") {
+		return nil
+	}
+	db := model.Db.Model(GroupPower{})
+	updateMap := make(map[string]interface{})
+	if name != "" {
+		updateMap["name"] = name
+	}
+	if nameplate != "" {
+		updateMap["nameplate"] = nameplate
+		db = db.Where("not exists (select id from group_power where nameplate = ?)", nameplate)
+	}
+	if declaration != "" {
+		updateMap["declaration"] = declaration
+	}
+	if icon != "" {
+		updateMap["icon"] = icon
+	}
+	result := db.Updates(updateMap).Limit(1)
+	if result.Error != nil {
+		return myerr.WrapErr(result.Error)
+	}
+	if result.RowsAffected <= 0 {
+		return myerr.WrapErr(bizerr.GroupPowerHaveChangeInfo)
+	}
+
+	return nil
+}
+
+func IsExistsNameplate(model *domain.Model, nameplate string) bool {
+	var count int64
+	err := model.Db.Model(GroupPower{}).Where("nameplate = ?", nameplate).Count(&count).Error
+	if err != nil {
+		model.Log.Errorf("IsExistsNameplate err:%v, nameplate:%s", err, nameplate)
+		return false
+	}
+	if count > 0 {
+		return true
+	}
+	return false
+}

domain/model/groupPower_m/groupPower.go

@@ -26,6 +26,14 @@ type GroupPower struct {
 	GroupUid      mysql.Str
 	Name          mysql.Str
 	Status        groupPower_e.GroupPowerStatus
+	Nameplate     mysql.Str // 铭牌
+	Declaration   mysql.Str // 宣言
+	Icon          mysql.Str // 头像
+	Grade         mysql.Num `gorm:"-"` // 等级
+	Exp           mysql.Num `gorm:"-"` // 当前经验值
+	NextExp       mysql.Num `gorm:"-"` // 升到下一级需要的经验值
+	GradeName     mysql.Str // 等级称号
+	GradeMedal    mysql.Str // 等级勋章图片
 }
 
 type GroupPowerUser struct {
@@ -334,6 +342,34 @@ func GetGroupPowerByGroupOrNil(model *domain.Model, groupUid string) (*GroupPowe
 	return &groupPower, nil
 }
 
+// 某个势力的势力主是否是代理
+func IsGroupPowerHasMgrDealer(model *domain.Model, groupId mysql.ID) (bool, error) {
+	var num int64
+	if err := model.Db.Raw("select count(1) from (select * from diamond_dealer where user_id in "+
+		"(select user_id from group_power_user where group_power_id = ? and role = ?)) a", groupId, groupPower_e.GroupPowerUserRoleMgr).
+		Scan(&num).Error; err != nil {
+		return false, myerr.WrapErr(err)
+	}
+	if num > 0 {
+		return true, nil
+	}
+	return false, nil
+}
+
+// 某个家族是否有家族代理
+func IsGroupPowerHasFamilyAgent(model *domain.Model, groupId mysql.ID) (bool, error) {
+	var num int64
+	if err := model.Db.Raw("select count(1) from diamond_dealer where status=1 and is_family_agent=1 and user_id in "+
+		"(select user_id from group_power_user where group_power_id = ?)", groupId).
+		Scan(&num).Error; err != nil {
+		return false, myerr.WrapErr(err)
+	}
+	if num > 0 {
+		return true, nil
+	}
+	return false, nil
+}
+
 func GetGroupPowerMap(db *gorm.DB, userIds []mysql.ID) (map[mysql.ID]uint64, error) {
 	rows := make([]GroupPowerUser, 0)
 	if len(userIds) > 0 {

domain/model/groupPower_m/group_power_apply.go

+package groupPower_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"gorm.io/gorm"
+	"hilo-group/common"
+	"hilo-group/myerr"
+	"hilo-group/myerr/bizerr"
+	"time"
+)
+
+type GroupPowerApplyJoin struct {
+	Id           uint64    `json:"id"`
+	UserId       uint64    `json:"user_id"`
+	GroupPowerId uint64    `json:"group_power_id"`
+	CreatedTime  time.Time `json:"created_time"`
+	UpdatedTime  time.Time `json:"updated_time"`
+	IsAccept     int8      `json:"is_accept"`
+	MgrId        uint64    `json:"mgr_id"`
+}
+
+func InsertGroupPowerApplyJoin(model *domain.Model, userId, familyId uint64) error {
+	sql := "insert into group_power_apply_join(user_id,group_power_id,is_accept) " +
+		"select ?, ?, ? where not exists (select id from group_power_apply_join where user_id=? and group_power_id=? and is_accept=0)"
+	result := model.Db.Exec(sql, userId, familyId, 0, userId, familyId)
+	if result.Error != nil {
+		return myerr.WrapErr(result.Error)
+	}
+	if result.RowsAffected <= 0 {
+		return myerr.WrapErr(bizerr.GroupPowerHaveAlreadyApply)
+	}
+	return nil
+}
+
+func GetGroupPowerApplyJoin(model *domain.Model, userId, familyId uint64) (*GroupPowerApplyJoin, error) {
+	res := new(GroupPowerApplyJoin)
+	err := model.Db.Where(GroupPowerApplyJoin{UserId: userId, GroupPowerId: familyId}).Where("is_accept=0").First(&res).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	return res, nil
+}
+
+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=? and is_accept = 0", optType, mgrId, id).Error
+	if err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+func AcceptGroupPowerApplyJoin(model *domain.Model, userId, familyId uint64) error {
+	err := model.Db.Exec("update group_power_apply_join set is_accept = 1 where user_id=? and group_power_id=?", userId, familyId).Error
+	if err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+func OptGroupPowerApplyList(model *domain.Model, familyId uint64, pageSize, pageIndex int) ([]*GroupPowerApplyJoin, int, bool, error) {
+	rows := make([]*GroupPowerApplyJoin, 0)
+	db := model.Db.Model(GroupPowerApplyJoin{}).Where("group_power_id = ?", familyId).Order("is_accept, created_time desc")
+	var count int64
+	err := db.Count(&count).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	err = db.Limit(pageSize).Offset(pageIndex - 1).Find(&rows).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	nextIdx, hasNext := common.PageNext(count, pageIndex, pageSize)
+	return rows, nextIdx, hasNext, nil
+}

domain/model/groupPower_m/group_power_invite.go

+package groupPower_m
+
+import (
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-group/myerr"
+	"time"
+)
+
+type GroupPowerInviteJoin struct {
+	Id           uint64    `json:"id"`
+	UserId       uint64    `json:"user_id"`
+	GroupPowerId uint64    `json:"group_power_id"`
+	CreatedTime  time.Time `json:"created_time"`
+	UpdatedTime  time.Time `json:"updated_time"`
+	InviteUserId uint64    `json:"invite_user_id"`
+	IsAccept     int8      `json:"is_accept"`
+}
+
+func InsertGroupPowerInviteJoin(userId, inviteUserId, familyId uint64) error {
+	nowTime := time.Now()
+	sql := "insert into group_power_invite_join(user_id,invite_user_id,group_power_id,is_accept,created_time,updated_time) " +
+		"value(?,?,?,?,?,?) on duplicate key update is_accept=?,created_time=?,updated_time=?"
+	err := mysql.Db.Exec(sql, userId, inviteUserId, familyId, 0, nowTime, nowTime, 0, nowTime, nowTime).Error
+	if err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+func GetGroupPowerInviteJoin(userId, familyId uint64) (*GroupPowerInviteJoin, error) {
+	res := new(GroupPowerInviteJoin)
+	err := mysql.Db.Where(GroupPowerInviteJoin{UserId: userId, GroupPowerId: familyId}).Where("is_accept=0").First(&res).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	return res, nil
+}
+
+func AcceptGroupPowerInviteJoin(userId, familyId uint64) error {
+	err := mysql.Db.Exec("update group_power_invite_join set is_accept = 1 where user_id=? and group_power_id=?", userId, familyId).Error
+	if err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}

domain/model/group_m/groupInfo.go

@@ -515,29 +515,23 @@ func GetLatestGroupInfos(model *domain.Model, limit, lastId int, groupIds []stri
 	return
 }
 
-//func init() {
-//	// 初始化官方群组
-//	strGroupIds := strings.Split(config.GetConfigApp().OFFICIAL_GROUP, ",")
-//	for _, i := range strGroupIds {
-//		if len(i) > 0 {
-//			officialGroup = append(officialGroup, i)
-//		}
-//	}
-//	mylogrus.MyLog.Info("Official groups: ", officialGroup)
-//
-//	event.AddUserInfoUpdate(func(model *domain.Model, e interface{}) error {
-//		event := e.(*event.UserInfoUpdateEvent)
-//		if event.Country == nil {
-//			return nil
-//		} else {
-//			// v2.3需求：同步更新群组country
-//			model.Log.Infof("Receive userInfoUpdate: user %d, country %s", event.UserId, *event.Country)
-//			return UpdateCountryByOwner(model, *event.Country, event.UserId)
-//		}
-//	})
-//	event.AddMgrUserCountryUpdateAsync(func(model *domain.Model, event *event.MgrUserCountryUpdateEvent) error {
-//		// v2.3需求：同步更新群组country
-//		model.Log.Infof("Receive MgrUserCountryUpdate: user %d, from %s to %s", event.UserId, event.OldCountry, event.NewCountry)
-//		return UpdateCountryByOwner(model, event.NewCountry, event.UserId)
-//	})
-//}
+func GetFamilyRooms(model *domain.Model, familyId uint64, pageSize, pageIndex int) ([]*GroupInfo, int, bool, error) {
+	rows := make([]*GroupInfo, 0)
+	db := model.Db.Model(GroupInfo{}).Where("owner in (select user_id from group_power_user where group_power_id=? order by field(`role`, 2, 3, 1))", familyId)
+	var count int64
+	err := db.Count(&count).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	err = db.Limit(pageSize).Offset((pageIndex - 1) * pageSize).Find(&rows).Error
+	if err != nil {
+		return nil, 0, false, err
+	}
+	var nextIdx int
+	var hasNext bool
+	if count > int64(pageIndex*pageSize) {
+		hasNext = true
+		nextIdx = pageIndex + 1
+	}
+	return rows, nextIdx, hasNext, nil
+}

domain/model/user_m/user.go

@@ -118,3 +118,12 @@ func BatchGetUserByExtIds(model *domain.Model, extIds []string) ([]User, error)
 	}
 	return users, nil
 }
+
+//获取用户
+func GetUsers(model *domain.Model, ids []mysql.ID) ([]*User, error) {
+	res := make([]*User, 0)
+	if err := model.Db.WithContext(model.Context).Where("id in (?)", ids).Find(&res).Error; err != nil {
+		return nil, myerr.WrapErr(err)
+	}
+	return res, nil
+}

domain/service/diamond_s/diamond.go

+package diamond_s
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"hilo-group/common"
+	"hilo-group/domain/model/diamond_m"
+	"hilo-group/domain/model/groupPower_m"
+	"hilo-group/domain/model/res_m"
+	"hilo-group/myerr"
+	"hilo-group/myerr/bizerr"
+)
+
+type DiamondService struct {
+	svc *domain.Service
+}
+
+func NewDiamondService(myContext *mycontext.MyContext) *DiamondService {
+	svc := domain.CreateService(myContext)
+	return &DiamondService{svc}
+}
+
+// 币商转账钻石-家族限制检查
+func (this *DiamondService) CheckDealerTransferFamilyLimit(dealerId, userId uint64, lang string) error {
+	model := domain.CreateModelContext(this.svc.MyContext)
+	// 代理、用户是否加入了家族
+	dealerFamily, err := groupPower_m.GetGroupPowerUserOrNil(model, dealerId)
+	if err != nil {
+		return err
+	}
+	// 代理是否是家族代理
+	isFamilyAgent, err := diamond_m.IsFamilyDiamondDealer(mysql.Db, dealerId)
+	if err != nil {
+		return err
+	}
+
+	userFamily, err := groupPower_m.GetGroupPowerUserOrNil(model, userId)
+	if err != nil {
+		return err
+	}
+	// 用户的家族是否有家族代理
+	var userHasFamilyAgent bool
+	if userFamily != nil {
+		userHasFamilyAgent, err = groupPower_m.IsGroupPowerHasFamilyAgent(model, userFamily.GroupPowerId)
+		if err != nil {
+			return err
+		}
+	}
+	if dealerFamily != nil && dealerFamily.GroupPowerId > 0 { // 代理加入了家族
+		if isFamilyAgent && (userFamily == nil || userFamily.GroupPowerId != dealerFamily.GroupPowerId) { // 是家族代理：只能向本家族成员转移钻石，如果向非家族成员转移钻石，则提示“非家族成员”
+			return myerr.WrapErr(res_m.GetErrByLanguage(model.Db, common.MSG_ID_NOT_FAMILY_MEMBER, lang, bizerr.GroupPowerDealerNotMember))
+		}
+		if !isFamilyAgent && userHasFamilyAgent { // 不是家族代理：如果用户加入了家族，且家族中有家族代理，那么也不能，“此用户已有家族代理，不能出售钻石”
+			return myerr.WrapErr(res_m.GetErrByLanguage(model.Db, common.MSG_ID_DEALER_CAN_NOT_SOLE, lang, bizerr.GroupPowerDealerCanNotSole))
+		}
+	} else { // 代理没有加入家族的
+		// 普通代理：不能向已经加入家族的成员（并且家族有家族代理）转移钻石，如果转移则提示“此用户已有家族代理，不能出售钻石”
+		if userHasFamilyAgent {
+			return myerr.WrapErr(res_m.GetErrByLanguage(model.Db, common.MSG_ID_DEALER_CAN_NOT_SOLE, lang, bizerr.GroupPowerDealerCanNotSole))
+		}
+	}
+	return nil
+}

go.mod

@@ -20,6 +20,13 @@ require (
 	gorm.io/gorm v1.23.8
 )
 
+require (
+	github.com/jinzhu/now v1.1.5
+	github.com/jonboulle/clockwork v0.3.0 // indirect
+	github.com/robfig/cron v1.2.0
+	github.com/spf13/cast v1.5.0
+)
+
 require (
 	github.com/AgoraIO/Tools/DynamicKey/AgoraDynamicKey/go/src v0.0.0-20200910100525-12b7f1b63a6a // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
@@ -57,7 +64,7 @@ require (
 	github.com/go-playground/universal-translator v0.17.0 // indirect
 	github.com/go-playground/validator/v10 v10.2.0 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/consul/api v1.7.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
 	github.com/hashicorp/go-hclog v0.12.0 // indirect
@@ -67,10 +74,8 @@ require (
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/hashicorp/serf v0.9.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/joho/godotenv v1.3.0 // indirect
-	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/json-iterator/go v1.1.9 // indirect
 	github.com/leodido/go-urn v1.2.0 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect
@@ -83,8 +88,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
-	github.com/robfig/cron v1.2.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.479 // indirect
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ims v1.0.479 // indirect
 	github.com/tencentyun/tls-sig-api-v2-golang v1.0.0 // indirect
@@ -92,7 +95,7 @@ require (
 	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
 	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
 	golang.org/x/text v0.3.6 // indirect
-	golang.org/x/tools v0.0.0-20190907020128-2ca718005c18 // indirect
+	golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	google.golang.org/grpc v1.42.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect

myerr/bizerr/bizCode.go

@@ -71,12 +71,26 @@ var (
 	GroupNoPowerToSvip6     = myerr.NewBusinessCode(14026, "Cannot use this permission for SVIP6", myerr.BusinessData{})                                           // 踢出,无法对SVIP6使用此权限
 
 	// 家族
-	GroupPowerHasJoinOther = myerr.NewBusinessCode(15001, "You already have joined power, please exit first", myerr.BusinessData{}) // 已经加入了其它国家势力
-	GroupPowerHasJoinMy    = myerr.NewBusinessCode(15002, "You already have joined power, please exit first", myerr.BusinessData{}) // 已经加入了该国家势力
-	GroupPowerOwnerLeave   = myerr.NewBusinessCode(15003, "power owner cannot exit", myerr.BusinessData{})                          // 势力主不能退出
-	GroupPowerNotExist     = myerr.NewBusinessCode(15004, "国家势力不存在", myerr.BusinessData{})                                          // 国家势力不存在
-	GroupPowerNoOwner      = myerr.NewBusinessCode(15005, "power owner not exits or unique", myerr.BusinessData{})                  // 国家势力主不存在或不唯一
-	GroupPowerStayTooShort = myerr.NewBusinessCode(15006, "You joined this power not more than 10 days ago", myerr.BusinessData{})  // 加入国家势力不超过10天
+	GroupPowerHasJoinOther      = myerr.NewBusinessCode(15001, "You already have joined power, please exit first", myerr.BusinessData{})              // 已经加入了其它国家势力
+	GroupPowerHasJoinMy         = myerr.NewBusinessCode(15002, "You already have joined power, please exit first", myerr.BusinessData{})              // 已经加入了该国家势力
+	GroupPowerOwnerLeave        = myerr.NewBusinessCode(15003, "power owner cannot exit", myerr.BusinessData{})                                       // 势力主不能退出
+	GroupPowerNotExist          = myerr.NewBusinessCode(15004, "国家势力不存在", myerr.BusinessData{})                                                       // 国家势力不存在
+	GroupPowerNoOwner           = myerr.NewBusinessCode(15005, "power owner not exits or unique", myerr.BusinessData{})                               // 国家势力主不存在或不唯一
+	GroupPowerStayTooShort      = myerr.NewBusinessCode(15006, "You joined this power not more than 10 days ago", myerr.BusinessData{})               // 加入国家势力不超过10天
+	GroupPowerDealerNotMember   = myerr.NewBusinessCode(15007, "Not family member", myerr.BusinessData{})                                             // 代理转账失败-非家族成员
+	GroupPowerDealerCanNotSole  = myerr.NewBusinessCode(15008, "This user already has a family agent and cannot sell diamonds", myerr.BusinessData{}) // 代理转账失败-此用户已有家族代理，不能出售钻石
+	GroupPowerDealerCanNotBuy   = myerr.NewBusinessCode(15009, "Buy diamonds from your family agent", myerr.BusinessData{})                           // 请向本家族代理购买钻石
+	GroupPowerDealerNeedJoin    = myerr.NewBusinessCode(15010, "Please join the agent's family to purchase", myerr.BusinessData{})                    // 请加入代理的家族后进行购买
+	GroupPowerHaveNoJoin        = myerr.NewBusinessCode(15011, "You have no joined power", myerr.BusinessData{})                                      // 还未加入国家势力
+	GroupPowerHaveNoPower       = myerr.NewBusinessCode(15012, "You have no power", myerr.BusinessData{})                                             // 没有权限
+	GroupPowerHaveNoApply       = myerr.NewBusinessCode(15013, "User have no apply", myerr.BusinessData{})                                            // 没有找到申请
+	GroupPowerHaveAlreadyApply  = myerr.NewBusinessCode(15014, "Already applied", myerr.BusinessData{})                                               // 已经申请过
+	GroupPowerHaveAlreadyChange = myerr.NewBusinessCode(15015, "Already changed", myerr.BusinessData{})                                               // 已经改变了
+	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{})
 

mysql/3.5.0.sql

+ALTER TABLE hilo.group_power ADD nameplate varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' NOT NULL COMMENT '家族铭牌';
+ALTER TABLE hilo.group_power ADD declaration varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' NOT NULL COMMENT '家族宣言';
+ALTER TABLE hilo.group_power ADD icon varchar(200) DEFAULT '' NOT NULL COMMENT '家族头像';
+update hilo.group_power set nameplate = id;
+CREATE UNIQUE INDEX nameplate_IDX USING BTREE ON hilo.group_power (nameplate);
+
+CREATE TABLE `group_power_invite_join` (
+                                           `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                           `user_id` bigint unsigned NOT NULL COMMENT '被邀请者id',
+                                           `group_power_id` bigint unsigned NOT NULL,
+                                           `created_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                           `updated_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                           `invite_user_id` bigint unsigned NOT NULL COMMENT '邀请者id',
+                                           `is_accept` tinyint NOT NULL DEFAULT '0' COMMENT '是否已经接受邀请',
+                                           PRIMARY KEY (`id`),
+                                           UNIQUE KEY `user_group` (`user_id`,`group_power_id`),
+                                           KEY `group_power_id` (`group_power_id`),
+                                           KEY `invite_user_id` (`invite_user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='邀请加入家族';
+
+CREATE TABLE `group_power_apply_join` (
+                                          `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                          `user_id` bigint unsigned NOT NULL COMMENT '申请者id',
+                                          `group_power_id` bigint unsigned NOT NULL,
+                                          `created_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                          `updated_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                          `is_accept` tinyint NOT NULL DEFAULT '0' COMMENT '是否已经接受',
+                                          `mgr_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '审核的管理员id',
+                                          PRIMARY KEY (`id`),
+                                          KEY `group_power_id` (`group_power_id`),
+                                          KEY `user_id` (`user_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='申请加入家族';
+
+CREATE TABLE `group_power_quit_log` (
+                                        `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                        `user_id` bigint unsigned NOT NULL COMMENT '用户id',
+                                        `mgr_id` bigint unsigned NOT NULL COMMENT '操作人id',
+                                        `created_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                        `updated_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                        `group_power_id` bigint unsigned NOT NULL,
+                                        PRIMARY KEY (`id`),
+                                        KEY `user_id` (`user_id`) USING BTREE,
+                                        KEY `created_time` (`created_time`) USING BTREE,
+                                        KEY `mgr_id` (`mgr_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
\ No newline at end of file

route/charge_r/charge.go

+package charge_r
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"github.com/gin-gonic/gin"
+	"hilo-group/domain/cache/user_c"
+	"hilo-group/domain/service/diamond_s"
+	"hilo-group/req"
+	"hilo-group/resp"
+)
+
+// @Tags 充值
+// @Summary 是否可以分享充值链接
+// @Param extId query string true "分享对象的external id"
+// @Success 200
+// @Router /v1/charge/share [get]
+func CanShareChargeLink(c *gin.Context) (*mycontext.MyContext, error) {
+	myContext := mycontext.CreateMyContext(c.Keys)
+
+	userId, lang, err := req.GetUserIdLang(c, myContext)
+	if err != nil {
+		return myContext, err
+	}
+
+	extId := c.Query("extId")
+	model := domain.CreateModelContext(myContext)
+	toUser, err := user_c.GetUserByExternalId(model, extId)
+	if err != nil {
+		return myContext, err
+	}
+
+	// 家族限制检查
+	if err = diamond_s.NewDiamondService(myContext).CheckDealerTransferFamilyLimit(userId, toUser.ID, lang); err != nil {
+		myContext.Log.Errorf("CanShareChargeLink err:%v", err)
+		return myContext, err
+	}
+
+	resp.ResponseOk(c, nil)
+	return myContext, nil
+}

route/router.go

@@ -9,6 +9,7 @@ import (
 	"hilo-group/_const/enum/mgr_e"
 	_ "hilo-group/docs"
 	"hilo-group/domain/model/mgr_m"
+	"hilo-group/route/charge_r"
 	"hilo-group/route/group_power_r"
 	"hilo-group/route/group_r"
 )
@@ -125,6 +126,20 @@ func InitRouter() *gin.Engine {
 		groupPower.GET("/team", wrapper(group_power_r.GroupPowerTeam))
 		groupPower.GET("/billboard/week", wrapper(group_power_r.GroupPowerBillboardWeek))
 		groupPower.GET("/billboard/owner/week", wrapper(group_power_r.GroupPowerBillboardOwnerWeek))
+		groupPower.GET("/info", wrapper(group_power_r.GroupPowerInfo))
+		groupPower.GET("/rooms", wrapper(group_power_r.GroupPowerRooms))
+		groupPower.GET("/members", wrapper(group_power_r.GroupPowerMembers))
+		groupPower.POST("/apply", wrapper(group_power_r.GroupPowerApplyJoin))
+		groupPower.POST("/apply/pass", wrapper(group_power_r.GroupPowerApplyPass))
+		groupPower.GET("/apply/list", wrapper(group_power_r.GroupPowerApplyList))
+		groupPower.POST("/quit", wrapper(group_power_r.GroupPowerQuit))
+		groupPower.GET("/quit/list", wrapper(group_power_r.GroupPowerQuitList))
+		groupPower.POST("/admin", wrapper(group_power_r.GroupPowerSetAdmin))
+	}
+
+	charge := v1.Group("/charge")
+	{
+		charge.GET("/share", wrapper(charge_r.CanShareChargeLink))
 	}
 	return r
 }