合并

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -79,6 +79,20 @@ public class CommConstant {
     public static final Integer STATUS_UNACCALIMED = 0;
 
 
+    /**
+     * 活动的当前状态1:进行中
+     */
+    public static final Integer ACTIVITY_CONDITION_ONE = 1;
+
+    /**
+     * 活动的当前状态2:未开始
+     */
+    public static final Integer ACTIVITY_CONDITION_TWO = 2;
+
+    /**
+     * 活动的当前状态3:结束
+     */
+    public static final Integer ACTIVITY_CONDITION_ONE_THREE= 3;
 
 
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
@@ -60,17 +61,28 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 活动列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
-    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+    public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")Integer buildingId,
+                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
-        String openid = JWTUtils.getSubject(request);
-        /* buildingId 正在设计中*/
-        Integer buildingId = null;
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
         return responseBean;
     }
 
+    /**
+     * 活动详情
+     * @param dynamicId
+     * @param buildingId
+     * @return
+     */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
                                              @RequestParam("buildingId")Integer buildingId){
@@ -78,14 +90,17 @@ public class TaBuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 添加活动
+     * @param taActivityDynamicEnlist
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/wx/activityDynamicEnlistAdd", method = RequestMethod.POST)
-
-    public ResponseBean taActivityDynamicEnlist(@RequestParam("dynamicId")Integer dynamicId,
-                                                @RequestParam("phone")String phone,
-                                                @RequestParam("name")String name,
+    public ResponseBean taActivityDynamicEnlist(@RequestBody TaActivityDynamicEnlist taActivityDynamicEnlist,
                                                 HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
-        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(dynamicId,phone,name);
+        ResponseBean  responseBean = iBuildingDynamicService.taActivityDynamicEnlistAdd(taActivityDynamicEnlist);
         return responseBean;
     }
 

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 
 import java.util.HashMap;
@@ -65,10 +66,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
 
     /**
      * 报名活动
-     * @param dynamicId
-     * @param phone
-     * @param name
      * @return
      */
-    ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name);
+    ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
@@ -177,20 +178,18 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean taActivityDynamicEnlistAdd(Integer dynamicId, String phone, String name) {
+    public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
         // 查询当前活动属于哪个楼盘
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(dynamicId+"");
-
-        TaActivityDynamicEnlist taActivityDynamicEnlist= new TaActivityDynamicEnlist();
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                               .setDynamic_id(dynamicId+"")
-                               .setPhone(phone).setName(name)
                                .setBuilding_id(taBuildingDynamic.getDynamicId());
-        taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
-        return ResponseBean.success("成功");
+        int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
+        return ResponseBean.success(state);
     }
 
-    // 根据报名开始时间和结束时间判断当前图标状态
+    /**
+     *     根据报名开始时间和结束时间判断当前图标状态
+     */
     private  TaBuildingDynamic  timeCondition(TaBuildingDynamic taBuildingDynamic){
         Long currentTime = LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli();
         if (null == taBuildingDynamic.getEnlistEnd () && null == taBuildingDynamic.getEnlistStart()){
@@ -202,15 +201,15 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         Long enlistStart = taBuildingDynamic.getEnlistStart().toInstant(ZoneOffset.of("+8")).toEpochMilli();
         // (1:进行中)当前时间小于报名截止时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistEnd ) {
-            taBuildingDynamic.setActivityCondition(1);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE);
         }
         //(2:未开始)当前时间是否小于报名时间,并且报名状态为1
         if (!"1".equals(taBuildingDynamic.getIsEnlist()) && currentTime <= enlistStart){
-            taBuildingDynamic.setActivityCondition(2);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_TWO);
         }
         //(3:结束)当前时间大于报名结束时间,并且报名状态为1
         if ("1".equals(taBuildingDynamic.getIsEnlist()) && currentTime >= enlistEnd){
-            taBuildingDynamic.setActivityCondition(3);
+            taBuildingDynamic.setActivityCondition(CommConstant.ACTIVITY_CONDITION_ONE_THREE);
         }
         return taBuildingDynamic;
     }