From ab1c1882e75029a38ef4046f2029d8618ed43b0c Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 9 Jul 2020 17:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BF=BD=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smile/activity/dao/ActivityInfoDao.java | 13 ++++++++++++- .../impl/ActivityParticipantServiceImpl.java | 17 ++++++++++++++--- .../mapper/smile/activity/ActivityInfoDao.xml | 14 ++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/dao/ActivityInfoDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/dao/ActivityInfoDao.java index ff40005..d0c63fe 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/dao/ActivityInfoDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/dao/ActivityInfoDao.java @@ -18,10 +18,11 @@ package com.elink.esua.epdc.modules.smile.activity.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.smile.activity.entity.ActivityInfoEntity; import com.elink.esua.epdc.smile.dto.activity.form.ActivityDetailFormDTO; import com.elink.esua.epdc.smile.dto.activity.form.ActivityInfoFormDTO; +import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO; import com.elink.esua.epdc.smile.dto.activity.result.ActivityInfoResultDTO; -import com.elink.esua.epdc.modules.smile.activity.entity.ActivityInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,6 +67,16 @@ public interface ActivityInfoDao extends BaseDao { */ ActivityInfoEntity activityDetail(ActivityDetailFormDTO formDto); + /** + * 功能描述: 活动状态查询 + * + * @param: formDto + * @return: ActivityInfoEntity + * @author: zhy + * @date: 2020/6/22 10:01 + */ + ActivityInfoEntity activityDetailState(ActivityParticipantFormDTO formDto); + /** * 功能描述: 活动人数更新 * diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityParticipantServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityParticipantServiceImpl.java index 48b6328..6cc8b62 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityParticipantServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/activity/service/impl/ActivityParticipantServiceImpl.java @@ -21,19 +21,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils; import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.smile.dto.activity.ActivityParticipantDTO; -import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO; import com.elink.esua.epdc.modules.smile.activity.dao.ActivityInfoDao; import com.elink.esua.epdc.modules.smile.activity.dao.ActivityParticipantDao; +import com.elink.esua.epdc.modules.smile.activity.entity.ActivityInfoEntity; import com.elink.esua.epdc.modules.smile.activity.entity.ActivityParticipantEntity; import com.elink.esua.epdc.modules.smile.activity.redis.ActivityParticipantRedis; import com.elink.esua.epdc.modules.smile.activity.service.ActivityParticipantService; import com.elink.esua.epdc.modules.smile.feign.UserFeignClient; +import com.elink.esua.epdc.smile.dto.activity.ActivityParticipantDTO; +import com.elink.esua.epdc.smile.dto.activity.form.ActivityParticipantFormDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -101,8 +103,17 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl= activityInfoEntity.getActQuota()) { + // 活动为限制报名人数，并且已报名人数大于等于活动名额 + throw new RenException("活动名额已满"); + } + ActivityParticipantEntity user = baseDao.selectParticipant(dto.getActId(), dto.getUserId()); - // 先判断用户是否已报名，已报名则直接正常返回。 + // 判断用户是否已报名，已报名则直接正常返回。 if (user != null) { return; } diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/activity/ActivityInfoDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/activity/ActivityInfoDao.xml index 8238c9d..b907c48 100644 --- a/epdc-cloud-property/src/main/resources/mapper/smile/activity/ActivityInfoDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/smile/activity/ActivityInfoDao.xml @@ -74,6 +74,20 @@ DEL_FLAG = '0' AND ID = #{activityId} + UPDATE epdc_activity_info SET SIGN_UP_NUM = SIGN_UP_NUM + 1