修改报名活动自动审核不通过报名人数未减少问题

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>
 

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;

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("该活动暂时没有未审核的志愿者");
         }