Commit 5f6ed76c5bcbcdd778bb9112f7adfc9de31aa4d4
1 parent
94f336a8
Exists in
master
提交修改
Showing
2 changed files
with
18 additions
and
15 deletions
Show diff stats
src/HttpServer/logic/httpserver.go
| @@ -273,7 +273,7 @@ func FetchInviteReward(w http.ResponseWriter, r *http.Request) { | @@ -273,7 +273,7 @@ func FetchInviteReward(w http.ResponseWriter, r *http.Request) { | ||
| 273 | r.Body.Close() | 273 | r.Body.Close() |
| 274 | 274 | ||
| 275 | s := string(result) | 275 | s := string(result) |
| 276 | - logger.Info("FetchInviteReward , body:%v,uuid=%v", s) | 276 | + logger.Info("FetchInviteReward , body:%v", s) |
| 277 | 277 | ||
| 278 | HandleFetchInviteReward(w,s) | 278 | HandleFetchInviteReward(w,s) |
| 279 | 279 |
src/HttpServer/logic/logic.go
| @@ -387,26 +387,29 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { | @@ -387,26 +387,29 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { | ||
| 387 | //邀请打工 | 387 | //邀请打工 |
| 388 | invitelist,err := GetdagongList(rdata.Inviteuuid) | 388 | invitelist,err := GetdagongList(rdata.Inviteuuid) |
| 389 | if err != nil { | 389 | if err != nil { |
| 390 | - logger.Error("HandleEnterInvite GetdagongList failed") | 390 | + /*logger.Error("HandleEnterInvite GetdagongList failed") |
| 391 | resp.Result.Code = ERROR_SRVDB_FAILED | 391 | resp.Result.Code = ERROR_SRVDB_FAILED |
| 392 | //resp.Message = fmt.Sprintf("%s",err) | 392 | //resp.Message = fmt.Sprintf("%s",err) |
| 393 | - break | 393 | + break*/ |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | - if len(*invitelist) > 2 { | ||
| 397 | - logger.Error("HandleEnterInvite dagong num is full") | ||
| 398 | - resp.Result.Code = ERROR_DAGONG_FULL | ||
| 399 | - //resp.Message = "dagong full" | ||
| 400 | - break | 396 | + if invitelist != nil { |
| 397 | + if len(*invitelist) > 2 { | ||
| 398 | + logger.Error("HandleEnterInvite dagong num is full") | ||
| 399 | + resp.Result.Code = ERROR_DAGONG_FULL | ||
| 400 | + //resp.Message = "dagong full" | ||
| 401 | + break | ||
| 402 | + } | ||
| 403 | + | ||
| 404 | + //需要判断是否已经处于打工中 | ||
| 405 | + if invitelist.IsInWork(rdata.Selfuuid) { | ||
| 406 | + logger.Error("HandleEnterInvite IsInWork") | ||
| 407 | + resp.Result.Code = ERROR_DAGONG_FULL | ||
| 408 | + //resp.Message = "ERROR_ALREADY_INWORK" | ||
| 409 | + break | ||
| 410 | + } | ||
| 401 | } | 411 | } |
| 402 | 412 | ||
| 403 | - //需要判断是否已经处于打工中 | ||
| 404 | - if invitelist.IsInWork(rdata.Selfuuid) { | ||
| 405 | - logger.Error("HandleEnterInvite IsInWork") | ||
| 406 | - resp.Result.Code = ERROR_DAGONG_FULL | ||
| 407 | - //resp.Message = "ERROR_ALREADY_INWORK" | ||
| 408 | - break | ||
| 409 | - } | ||
| 410 | 413 | ||
| 411 | err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist) | 414 | err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist) |
| 412 | 415 |