活动修改

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/ActivityQO.java

@@ -20,6 +20,9 @@ import java.io.Serializable;
 public class ActivityQO implements Serializable {
     private static final long serialVersionUID = -5184984402962050696L;
 
+    @ApiModelProperty(value = "活动名称")
+    private Integer activityName;
+
     @ApiModelProperty(value = "活动id")
     private Integer activityId;
 

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, Integer userAccountId);
+    int countActivityPart(Integer activityId);
 
     void insertActivityPart(ActivityPartDO activityPartDO);
 

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

@@ -103,7 +103,7 @@ public class ActivityServiceImpl implements ActivityService {
             return ResultBody.success();
         }
         // 查询是否超过奖励限制
-        int count = activityDao.countActivityPart(activityDO.getId(), userAccountId);
+        int count = activityDao.countActivityPart(activityDO.getId());
         if (activityDO.getRequireNum() == 0 || count < activityDO.getRequireNum()) {
             log.info("Activity invite award! userAccountId:{}", userAccountId);
             // 暂时只奖励积分

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

@@ -89,6 +89,9 @@
             parameterType="com.mmc.iuav.user.model.qo.ActivityQO">
         select count(*) from activity
         where is_deleted = 0
+        <if test="activityName != null">
+            and activity_name = #{activityName}
+        </if>
         <if test="activityType != null">
             and activity_type = #{activityType}
         </if>
@@ -102,6 +105,9 @@
         <include refid="activity_column"/>
         from activity ac
         where ac.is_deleted = 0
+        <if test="activityName != null">
+            and ac.activity_name = #{activityName}
+        </if>
         <if test="activityType != null">
             and ac.activity_type = #{activityType}
         </if>
@@ -148,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} and acp.user_account_id = #{userAccountId}
+         where acp.activity_id = #{activityId}
     </select>
 
     <select id="activityPartDetail" resultType="com.mmc.iuav.user.entity.activity.ActivityPartDO"