From fbd23f222c52a5c6dd246db67256ac65cc2de141 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Fri, 7 Feb 2020 17:08:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=8D=E9=99=90=E5=90=8D?=
 =?UTF-8?q?=E9=A2=9D=E8=AF=A6=E6=83=85=E7=94=A8=E6=88=B7=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/activity/entity/ActInfoEntity.java    |  4 ++--
 .../activity/service/impl/ActInfoServiceImpl.java      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
index c82c66a91..68e6cc86d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
@@ -198,8 +198,8 @@ public class ActInfoEntity extends BaseEpdcEntity {
      */
 	private Integer reward;
 	/**
-	 * 活动名额类型
+	 * 活动名额类型(0-不限名额，1-固定名额)
 	 */
 	private Integer actQuotaCategory;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index 542623f1e..310b91ec8 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -307,13 +307,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             }
         } else if (currentTime.before(actInfoEntity.getSignupEndTime())) {
             /*报名截至时间前：
-            1、当前用户未报名底部显示按钮  我要报名
-            2、当前用户未报名且活动名额已满底部显示按钮  已报满
+            1、当前用户未报名底部显示按钮  我要报名(不限名额或者未报满的)
+            2、当前用户未报名且活动名额已满底部显示按钮  已报满（限制名额且已经报满的）
             3、当前用户已报名（未审核、审核通过的）底部显示按钮  取消报名
             4、当前用户（报名审核未通过或者已经取消报名的）可再次报名-我要报名*/
-            if (null == actUserRelationEntity && (actInfoEntity.getActQuota() > actInfoEntity.getSignupNum())) {
+            if (null == actUserRelationEntity && (NumConstant.ZERO==actInfoEntity.getActQuotaCategory()
+                                    ||actInfoEntity.getActQuota() > actInfoEntity.getSignupNum())) {
                 currentUserStatus = ActUserStatusConstant.SIGN_UP;
-            } else if (null == actUserRelationEntity && (actInfoEntity.getActQuota().equals(actInfoEntity.getSignupNum()))) {
+            } else if (null == actUserRelationEntity && (NumConstant.ONE==actInfoEntity.getActQuotaCategory()
+                            &&actInfoEntity.getActQuota().equals(actInfoEntity.getSignupNum()))) {
                 currentUserStatus = ActUserStatusConstant.FULL_SIGN_UP;
             } else if (null != actUserRelationEntity
                     && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus())