合并

src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java

@@ -2,24 +2,17 @@ package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-
-/**
- * <p>
- * 点赞表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@TableName("ta_activity_dynamic_enlist")
 public class TaActivityDynamicEnlist implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -55,9 +48,4 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private String phone;
 
-    /**
-     * favor_num
-     */
-
-
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -219,7 +219,18 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Override
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
         // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.selectById(taActivityDynamicEnlist.getDynamicId());
+        // 判断当前活动是否满
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
+        int contActivity = taActivityDynamicEnlistMapper.selectCount(taBuildingDynamicQuery);
+        int personNum= Integer.parseInt(null == taBuildingDynamic.getPersonNum()?"0": taBuildingDynamic.getPersonNum());
+        // 当报名人数已满时，活动为已结束
+        if (contActivity > personNum){
+            taBuildingDynamic.setIsEnlist("2");
+            buildingDynamicMapper.updateById(taBuildingDynamic);
+            return ResponseBean.success("当前报名人数已满");
+        }
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
                                .setBuildingId(taBuildingDynamic.getDynamicId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);