活动报名

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -226,6 +226,8 @@ public class TaBuildingDynamicController extends BaseController {
     public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -236,7 +238,7 @@ public class TaBuildingDynamicController extends BaseController {
         // 携带的报名人数(是已经包括自己了)，不能超过活动总人数
 
         // 当前活动已报名的总人数
-        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), getOrgId(request));
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
             return ResponseBean.error("报名失败，超过活动报名的最大人数！", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -257,10 +259,9 @@ public class TaBuildingDynamicController extends BaseController {
 
 
         TaPerson person = taPersons.get(0);
-        Integer orgId = getOrgId(request);
         taActivityDynamicEnlist.setPersonId(person.getPersonId());
         taActivityDynamicEnlist.setOrgId(orgId);
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist, orgId);
         return responseBean;
     }
     

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -72,7 +72,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 报名活动
      * @return
      */
-    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
+    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId);
 
     /**
      * 报名列表

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

@@ -156,6 +156,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(buildingDynamic.getDynamicId(), orgId);
         buildingDynamic.setEnlisted(enlistCount);
 
+        // 活动海报
+        buildingDynamic.setPosters(taPosterService.getPostersForTarget(buildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
+
         return ResponseBean.success(buildingDynamic);
     }
 
@@ -216,23 +219,29 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId) {
         ResponseBean responseBean= new ResponseBean<>();
         // 查询当前活动属于哪个楼盘
         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());
+
+        /**
+         * 判断当前活动是否满
+         */
+
+        TaBuildingDynamic buildingDynamic = this.getById(taActivityDynamicEnlist.getDynamicId());
+        // 已报名人数
+        Integer enlistCount = taActivityDynamicEnlistMapper.selectEnlistCount(taActivityDynamicEnlist.getDynamicId(), orgId);
+
         // 当报名人数已满时，活动为已结束
-        if (contActivity >= personNum){
+        if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getEnlistNum().intValue()) {
             taBuildingDynamic.setIsEnlist("2");
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
         // 判断是否报名根据电话号码校验
+        QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
+        taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
         taBuildingDynamicQuery.eq("phone",taActivityDynamicEnlist.getPhone());
         TaActivityDynamicEnlist activityDynamicEnlist = taActivityDynamicEnlistMapper.selectOne(taBuildingDynamicQuery);
         if (null !=activityDynamicEnlist){

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -6,6 +6,6 @@
         </select>
 
         <select id="selectEnlistCount" resultType="Integer" >
-            select sum(attend_num) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
+            select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
 </mapper>