活动人数限制修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/ActivityDao.java

@@ -31,7 +31,7 @@ public interface ActivityDao {
 
     ActivityDO currentActivity(Integer activityType);
 
-    int countActivityPart(Integer activityId);
+    int countActivityPart(Integer activityId, Integer userAccountId);
 
     void insertActivityPart(ActivityPartDO activityPartDO);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/ActivityServiceImpl.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.service.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
 import com.mmc.iuav.user.dao.ActivityDao;
 import com.mmc.iuav.user.entity.activity.ActivityDO;
 import com.mmc.iuav.user.entity.activity.ActivityPartDO;
@@ -103,14 +104,14 @@ public class ActivityServiceImpl implements ActivityService {
             return ResultBody.success();
         }
         // 查询是否超过奖励限制
-        int count = activityDao.countActivityPart(activityDO.getId());
+        int count = activityDao.countActivityPart(activityDO.getId(), userAccountId);
         if (activityDO.getRequireNum() == 0 || count < activityDO.getRequireNum()) {
             log.info("Activity invite award! userAccountId:{}", userAccountId);
             // 暂时只奖励积分
             ChangeUserPointVO changePoint = new ChangeUserPointVO();
             changePoint.setUserAccountId(userAccountId);
             changePoint.setChangePoint(activityDO.getRewardValue());
-            changePoint.setChangeType(7);
+            changePoint.setChangeType(UserPointsEnum.INVITE_USER.getCode());
             userPointsService.change(changePoint);
             // 记录领取信息（被邀请）
             ActivityPartDO activityPartDO = new ActivityPartDO();

csm-service/cms-service-user/src/main/resources/mapper/activity.xml

@@ -154,7 +154,7 @@
 
     <select id="countActivityPart" resultType="java.lang.Integer">
         select count(*) from activity ac inner join activity_part acp on ac.id = acp.activity_id
-         where acp.activity_id = #{activityId}
+         where acp.activity_id = #{activityId} and acp.user_account_id = #{userAccountId}
     </select>
 
     <select id="activityPartDetail" resultType="com.mmc.iuav.user.entity.activity.ActivityPartDO"