提交

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

@@ -137,22 +137,14 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query", value = "项目"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "title", paramType = "query", value = "标题"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "startDate", paramType = "query", value = "活动开始时间"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间")
     })
     @RequestMapping(value = "/admin/helpActivityEffective/list", method = RequestMethod.GET)
     public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
-                                         @RequestParam(value = "buildingId", required = false) String buildingId,
-                                         @RequestParam(value = "title", required = false) String title,
-                                         @RequestParam(value = "startDate", required = false) String startDate,
-                                         @RequestParam(value = "endDate", required = false) String endDate,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId);
         return helpActivityList;
     }
 

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

@@ -99,8 +99,9 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/registerConsultant")
     public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
         ResponseBean responseBean = new ResponseBean();
-        if(smsUtils.checkCaptcha(phone,code)){
+        if(!smsUtils.checkCaptcha(phone,code)){
             responseBean.addError("验证码错误。");
+            return responseBean;
         }
         Integer orgId =getOrgId(request);
         String openid = getOpenId(request);

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

@@ -107,13 +107,11 @@ public class TaShareActivityController extends BaseController {
     @RequestMapping(value="/admin/taShareActivityEffective/list",method= RequestMethod.GET)
     public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            @RequestParam(value ="buildingId",required = false) String buildingId,
-                                            @RequestParam(value ="activityName",required = false) String activityName,
                                             @RequestParam(value ="cityId",required = false)Integer cityId,
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, buildingId, activityName, null, null, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, getOrgId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

src/main/java/com/huiju/estateagents/mapper/HelpActivityMapper.java

@@ -48,12 +48,8 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * 列表 已开始 和 未开始
      * @param pg
      * @param cityId
-     * @param buildingId
-     * @param title
-     * @param startDate
-     * @param endDate
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId);
 }

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

@@ -138,12 +138,8 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param pageNum
      * @param pageSize
      * @param cityId
-     * @param buildingId
-     * @param title
-     * @param startDate
-     * @param endDate
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
 }

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

@@ -35,13 +35,9 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * 查询拼团  已开始 和 未开始
      * @param pageNum
      * @param pageSize
-     * @param buildingId
-     * @param activityName
-     * @param startTime
-     * @param endTime
      * @param cityId
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
 }

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

@@ -29,13 +29,6 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     @Override
     public ResponseBean extendContentAdd(ExtendContent extendContent) {
         ResponseBean responseBean= new ResponseBean<>();
-        if ("1".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_ACTIVITY);
-        }else if("2".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
-        }else if ("3".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
-        }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
         return  responseBean;

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

@@ -238,10 +238,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer orgId) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, buildingId, title, startDate, endDate, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -75,18 +75,14 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, String buildingId, String activityName, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
         QueryWrapper<TaShareActivity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(buildingId != null, "building_id", buildingId);
-        queryWrapper.like(activityName != null, "activity_name", activityName);
         queryWrapper.in("activity_status", 0, 1);
-        queryWrapper.eq(startTime != null, "start_time", startTime);
-        queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.orderByAsc("activity_status");

src/main/resources/mapper/HelpActivityMapper.xml

@@ -78,28 +78,13 @@
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
         SELECT
-        COUNT(hir.verification) as succeedCount,
         ha.*
         FROM
         ta_help_activity ha
-        LEFT JOIN ta_help_initiate_record hir ON ha.help_activity_id = hir.help_activity_id
-        AND (hir.verification is NULL or hir.verification != '')
         <where>
             <if test="cityId != null and cityId != ''">
                 and ha.city_id = #{cityId}
             </if>
-            <if test="buildingId != null and buildingId != ''">
-                and ha.building_id = #{buildingId}
-            </if>
-            <if test="title != null and title != ''">
-                and ha.title like CONCAT('%',#{title}, '%')
-            </if>
-            <if test="startDate != null and startDate != ''and startDate!='Invalid date'">
-                and date_format(ha.start_date,'%Y-%m-%d') = date_format( #{startDate}, '%Y-%m-%d' )
-            </if>
-            <if test="endDate != null and endDate != ''and endDate!='Invalid date'">
-                and date_format(ha.end_date,'%Y-%m-%d') = date_format( #{endDate}, '%Y-%m-%d' )
-            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -175,7 +175,7 @@
                 GROUP BY building_id
                 ) as tba ON tb.building_id = tba.building_id
             </if>
-
+            WHERE tb.org_id = #{orgId}
             ORDER BY tb.order_no DESC
     </select>