Commit e19dda1a4bad8ff6b4643f31f6b07e14aee9a570
1 parent
ffc3a0c8
Exists in
master
修复bug
Showing
3 changed files
with
9 additions
and
0 deletions
Show diff stats
src/HttpServer/logic/constdef.go
| @@ -10,4 +10,5 @@ const ( | @@ -10,4 +10,5 @@ const ( | ||
| 10 | FRIEND_APPLY_LIMIT = 50 //好友申请当日上限 | 10 | FRIEND_APPLY_LIMIT = 50 //好友申请当日上限 |
| 11 | FRIEND_APPROVE_LIMIT = 50 //好友批准当日上限 | 11 | FRIEND_APPROVE_LIMIT = 50 //好友批准当日上限 |
| 12 | FRIEND_RECOMMAND_NUM = 3 //推荐好友数量 | 12 | FRIEND_RECOMMAND_NUM = 3 //推荐好友数量 |
| 13 | + TEAM_MAXNUM = 4 //队伍最大人数 | ||
| 13 | ) | 14 | ) |
| 14 | \ No newline at end of file | 15 | \ No newline at end of file |
src/HttpServer/logic/errordef.go
| @@ -38,4 +38,5 @@ const ( | @@ -38,4 +38,5 @@ const ( | ||
| 38 | ERROR_WECHATLOGINFAILED = 33 //获取好友信息失败 | 38 | ERROR_WECHATLOGINFAILED = 33 //获取好友信息失败 |
| 39 | ERROR_REGEISTACCOUNTEXIST = 34 //注册账号重复 | 39 | ERROR_REGEISTACCOUNTEXIST = 34 //注册账号重复 |
| 40 | ERROR_ACCOUNTPWDWRONG= 35 //账号登录密码不对 | 40 | ERROR_ACCOUNTPWDWRONG= 35 //账号登录密码不对 |
| 41 | + ERROR_TEAMISMAX= 36 //队伍人数已满 | ||
| 41 | ) | 42 | ) |
| 42 | \ No newline at end of file | 43 | \ No newline at end of file |
src/HttpServer/logic/logic.go
| @@ -921,6 +921,13 @@ func HandleJoinTeam(w http.ResponseWriter, data string) { | @@ -921,6 +921,13 @@ func HandleJoinTeam(w http.ResponseWriter, data string) { | ||
| 921 | break | 921 | break |
| 922 | } | 922 | } |
| 923 | 923 | ||
| 924 | + //需要判断队伍人数是否已满 | ||
| 925 | + if len(tinfo.MemInfo.MemList) > TEAM_MAXNUM { | ||
| 926 | + logger.Error("HandleJoinTeam failed=%v", err) | ||
| 927 | + resp.Result.Code = ERROR_TEAMISMAX | ||
| 928 | + break | ||
| 929 | + } | ||
| 930 | + | ||
| 924 | uinfo := vv.(*UserData) | 931 | uinfo := vv.(*UserData) |
| 925 | if uinfo.Shopnum < tinfo.BaseInfo.Least { | 932 | if uinfo.Shopnum < tinfo.BaseInfo.Least { |
| 926 | logger.Error("HandleJoinTeam failed=%v", err) | 933 | logger.Error("HandleJoinTeam failed=%v", err) |