活动内容

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -168,10 +168,6 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
     public List<ActivityConfigurationVo> queryIssueList(ActivityConfigurationQueryBo bo) {
         bo.setStartTime(DateUtils.getNowTime());
         List<ActivityConfigurationVo> courseConfigurationVos = baseMapper.selectConfiguraIssueList(bo);
-        for (ActivityConfigurationVo courseConfigurationVo : courseConfigurationVos) {
-            Integer integer = activityConfigurationUseService.countConfig(courseConfigurationVo.getId());
-            courseConfigurationVo.setUserNumber(integer);
-        }
         return courseConfigurationVos;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -41,6 +41,9 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
     @Autowired
     private ICouponService couponService;
 
+    @Autowired
+    private IActivityConfigurationUseService activityConfigurationUseService;
+
     @Override
     public ActivityConfigurationUseVo queryById(Long userId){
         ActivityConfigurationUse db = this.baseMapper.selectById(userId);
@@ -119,6 +122,10 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         //未领取过领取活动
         bo.setCreateTime(DateUtils.getNowTime());
         ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());
+        if (activityConfigurationUseService.countConfig(activityConfigurationVo.getId()).equals(activityConfigurationVo.getQuantity())){
+            throw new IllegalArgumentException("活动已领取结束");
+        }
+
         bo.setActivityType(Convert.toInt(activityConfigurationVo.getActivityType()));
         switch (bo.getActivityType()){
             case 3:

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="supdate_time"/>
         <result property="activityLogo" column="sactivity_logo"/>
         <result property="activityUrl" column="sactivity_url"/>
+        <result property="userNumber" column="userNum"/>
         <result property="status" column="sstatus"/>
         <result property="couponEnd" column="scoupon_end"/>
         <association property="courseList" javaType="java.util.List" resultMap="courses" />
@@ -181,7 +182,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         c.update_time as supdate_time,
         c.status as sstatus,
         c.coupon_end as scoupon_end,
-        c.activity_url as sactivity_url
+        c.activity_url as sactivity_url,
+        ( select COUNT(user_id) FROM activity_configuration_use y where 1=1 and c.id = y.configuration_id) as userNum
         <if test="userId != null and userId != ''" >
         ,( CASE WHEN ( SELECT COUNT( user_id ) FROM activity_configuration_use WHERE 1 = 1 AND user_id = #{userId} ) = 1 THEN 'yes' ELSE 'no' END ) AS useStatus
         </if>
@@ -257,6 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE 1=1
         and c.status = 3
           and c.activity_type in (3,4,5)
+        and c.quantity - ( select COUNT(user_id) FROM activity_configuration_use y where 1=1 and c.id = y.configuration_id) >0
         <if test="courseId != null" >
             and f.course_id = #{courseId}
         </if>