From 4e354088bf444e7d6703a70ee2d8c9846c3de7e5 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 12 May 2020 16:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=90=8D=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=8A=A5=E5=90=8D=E4=BA=BA=E6=95=B0=E6=9C=AA=E5=87=8F?=
 =?UTF-8?q?=E5=B0=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-module/epdc-heart/epdc-heart-server/pom.xml      | 4 +++-
 .../modules/activity/service/impl/ActInfoServiceImpl.java | 4 ++++
 .../activity/service/impl/ActUserRelationServiceImpl.java | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index 55819a13..a7fae661 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -162,8 +162,10 @@
                 <spring.datasource.druid.username>jinshui</spring.datasource.druid.username>
                 <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
 
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip></nacos.ip>
+                <nacos.namespace></nacos.namespace>
             </properties>
         </profile>
 
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 1c900fc7..db2a4ded 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
@@ -385,6 +385,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             if (ActUserRelationStatusConstant.SIGN_UP.equals(actUserStatus) || ActUserRelationStatusConstant.APPROVED.equals(actUserStatus)) {
                 return ActUserStatusConstant.CANCEL_SIGN_UP;
             }
+            //（未报名活动或者已取消报名的）底部显示按钮  已报满
+            if (NumConstant.ONE == actInfoEntity.getActQuotaCategory() && actInfoEntity.getSignupNum() >= actInfoEntity.getActQuota()) {
+                return ActUserStatusConstant.FULL_SIGN_UP;
+            }
             // （报名审核未通过或者已经取消报名的）可再次报名-我要报名
             if (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserStatus) || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserStatus)) {
                 return ActUserStatusConstant.SIGN_UP;
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
index 227bb14f..0bc38b03 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
@@ -48,6 +48,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
 import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
+import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
 import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity;
@@ -473,6 +474,13 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 actUserLog.setOperationTime(new Date());
                 actUserLogDao.insert(actUserLog);
             }
+            // 审核不通过，活动的报名人数减少
+            if (!NumConstant.ONE_STR.equals(actUserDefaultState)) {
+                ActInfoEntity actInfoEntity = new ActInfoEntity();
+                actInfoEntity.setId(actInfoDTO.getId());
+                actInfoEntity.setSignupNum(actInfoDTO.getSignupNum() - data.size());
+                actInfoService.updateById(actInfoEntity);
+            }
         } else {
             return new Result().ok("该活动暂时没有未审核的志愿者");
         }