From 01acaa6860ef91343e07cd511e860dd3f41926ab Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Fri, 10 Jul 2020 10:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smile/activity/dao/ActivityInfoDao.java   | 10 -----
 .../impl/ActivityParticipantServiceImpl.java  | 43 ++++++-------------
 .../mapper/smile/activity/ActivityInfoDao.xml | 14 ------
 3 files changed, 12 insertions(+), 55 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 d0c63fe..e32776c 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
@@ -67,16 +67,6 @@ public interface ActivityInfoDao extends BaseDao<ActivityInfoEntity> {
      */
     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 6cc8b62..9658e17 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,15 @@ 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.enums.YesOrNoEnum;
 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.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;
@@ -54,12 +50,6 @@ import java.util.Map;
 @Service
 public class ActivityParticipantServiceImpl extends BaseServiceImpl<ActivityParticipantDao, ActivityParticipantEntity> implements ActivityParticipantService {
 
-    @Autowired
-    private ActivityParticipantRedis activityParticipantRedis;
-
-    @Autowired
-    private UserFeignClient userFeignClient;
-
     @Autowired
     ActivityInfoDao activityInfoDao;
 
@@ -103,32 +93,26 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl<ActivityPart
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void signUp(ActivityParticipantFormDTO dto) {
-        ActivityInfoEntity activityInfoEntity = activityInfoDao.activityDetailState(dto);
-        // 先判断活动是否还是在正常时间内
-        if (activityInfoEntity == null) {
+        String actId = dto.getActId();
+        ActivityParticipantEntity user = baseDao.selectParticipant(actId, dto.getUserId());
+        // 判断用户是否已报名，已报名则直接正常返回。
+        if (user != null) {
+            return;
+        }
+
+        ActivityInfoEntity activityInfoEntity = activityInfoDao.selectById(actId);
+        if (dto.getSignUpTime().after(activityInfoEntity.getSignUpEndTime())) {
             throw new RenException("活动报名已经截止");
-        } else if (NumConstant.ONE_STR.equals(activityInfoEntity.getActQuotaFlag()) && activityInfoEntity.getSignUpNum() >= activityInfoEntity.getActQuota()) {
+        } else if (YesOrNoEnum.YES.value().equals(activityInfoEntity.getActQuotaFlag()) && activityInfoEntity.getSignUpNum() >= activityInfoEntity.getActQuota()) {
             // 活动为限制报名人数，并且已报名人数大于等于活动名额
             throw new RenException("活动名额已满");
         }
 
-        ActivityParticipantEntity user = baseDao.selectParticipant(dto.getActId(), dto.getUserId());
-        // 判断用户是否已报名，已报名则直接正常返回。
-        if (user != null) {
-            return;
-        }
         ActivityParticipantEntity entity = ConvertUtils.sourceToTarget(dto, ActivityParticipantEntity.class);
-        UserDTO userDto = userFeignClient.getUserInfoById(dto.getUserId()).getData();
-        if (userDto == null) {
-            throw new RenException("无法获取用户信息");
-        }
-        entity.setPartyFlag(userDto.getPartyFlag());
-        entity.setIdentityNo(userDto.getIdentityNo());
-        entity.setAge(getAge(userDto.getIdentityNo()));
         // 写入报名表
         insert(entity);
         // 活动表已报名人数字段 同步修改
-        activityInfoDao.signUp(dto.getActId());
+        activityInfoDao.signUp(actId);
     }
 
     @Override
@@ -145,7 +129,4 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl<ActivityPart
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-    private Integer getAge(String identityNo) {
-        return IdentityNoUtils.getAge(identityNo);
-    }
 }
\ No newline at end of file
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 b907c48..8238c9d 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,20 +74,6 @@
         DEL_FLAG = '0'
         AND ID = #{activityId}
     </select>
-    <select id="activityDetailState" resultType="com.elink.esua.epdc.modules.smile.activity.entity.ActivityInfoEntity">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM
-        epdc_activity_info a
-        WHERE
-        DEL_FLAG = '0'
-        <if test="actId != null and actId != ''">
-            AND ID = #{actId}
-        </if>
-        <if test="signUpTime != null">
-            AND SIGN_UP_END_TIME &gt; #{signUpTime}
-        </if>
-    </select>
     <update id="signUp">
         UPDATE epdc_activity_info
         SET SIGN_UP_NUM = SIGN_UP_NUM + 1