From 86cad636cca548c198abc3d1dd5fa7b8b784c9c0 Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Wed, 19 Aug 2020 15:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B8=B8=E6=88=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/game/bean/dto/ClientDto.java    |  6 +++---
 .../java/com/ccsens/game/service/ClientService.java | 13 +++++++------
 util/src/main/java/com/ccsens/util/CodeEnum.java    |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java b/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java
index 8c47c908..cdbcb83b 100644
--- a/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java
+++ b/game/src/main/java/com/ccsens/game/bean/dto/ClientDto.java
@@ -23,9 +23,9 @@ public class ClientDto {
         @NotNull(message = "请选择的时间")
         @ApiModelProperty("本地时间")
         private Long localTime;
-        @ApiModelProperty
-        @NotNull(message = "请选择项目")
-        private Long projectId;
+//        @ApiModelProperty("不再传参")
+//        @NotNull(message = "请选择项目")
+//        private Long projectId;
         @ApiModelProperty("分组id，不是分组游戏则为空")
         private Long groupId;
     }
diff --git a/game/src/main/java/com/ccsens/game/service/ClientService.java b/game/src/main/java/com/ccsens/game/service/ClientService.java
index 516c35c4..cf03792b 100644
--- a/game/src/main/java/com/ccsens/game/service/ClientService.java
+++ b/game/src/main/java/com/ccsens/game/service/ClientService.java
@@ -87,6 +87,12 @@ public class ClientService implements IClientService {
             //查询结果，返回对应的信息
             return joinResult(gameUserJoins.get(0), gameRecord, isGroup, join.getGroupId());
         }
+        if (isGroup) {
+            if (ObjectUtil.isNull(join.getGroupId())) {
+                log.info("分组信息为空");
+                throw new BaseException(CodeEnum.GROUP_NOT_CHOICE);
+            }
+        }
 
         //游戏已结束
         if (gameRecord.getGameStatus().byteValue() == GameConstant.GAME_COMPLETED) {
@@ -107,7 +113,6 @@ public class ClientService implements IClientService {
         }
 
         // 判断是否达到组内上限
-//        if (gameRecord.getMemberLimit())
         if (isGroup) {
             GameUserJoinGroupExample groupExample = new GameUserJoinGroupExample();
             groupExample.createCriteria().andGameGroupIdEqualTo(join.getGroupId());
@@ -134,7 +139,7 @@ public class ClientService implements IClientService {
         userJoin.setLocalStartTime(prepare || processing ? gameRecord.getStartTime() + timeMore : 0);
         userJoin.setLocalEndTime(prepare || processing ? gameRecord.getEndTime() + timeMore : 0);
         // 获取头像和用户名
-        JsonResponse<MemberVo.MemberInfo> memberInfo = tallFeignClient.getMemberByUserId(userId, join.getProjectId());
+        JsonResponse<MemberVo.MemberInfo> memberInfo = tallFeignClient.getMemberByUserId(userId, gameRecord.getTaskId());
         if (memberInfo.getData() == null) {
             memberInfo = tallFeignClient.getUserByUserId(userId);
         }
@@ -166,10 +171,6 @@ public class ClientService implements IClientService {
         gameUserJoinDao.insertSelective(userJoin);
         //如果是分组游戏，则添加用户与组的关联表
         if (isGroup) {
-            if (ObjectUtil.isNull(join.getGroupId())) {
-                log.info("分组信息为空");
-                throw new BaseException(CodeEnum.PARAM_ERROR);
-            }
             GameUserJoinGroup userJoinGroup = new GameUserJoinGroup();
             userJoinGroup.setId(snowflake.nextId());
             userJoinGroup.setUserJoinId(userJoin.getId());
diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java
index d760206f..a2cd9785 100644
--- a/util/src/main/java/com/ccsens/util/CodeEnum.java
+++ b/util/src/main/java/com/ccsens/util/CodeEnum.java
@@ -139,6 +139,7 @@ public enum CodeEnum {
     VOTE_NOT_START(117,"投票未开始",true),
     NOT_CONFIG_OR_ERR(118,"缺少配置信息，或配置信息异常",true),
     GROUP_MEMBER_LIMIT(119,"当前组内人员已满，请选择其他组",true),
+    GROUP_NOT_CHOICE(120,"请选择要加入的队伍",true),
 
     ;