首页和项目详情轮播图

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

@@ -512,9 +512,8 @@ public class HelpActivityController extends BaseController {
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) String buildingId,
-                                               @RequestParam(value = "type",required = false)Integer type) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
+                                               @RequestParam(value = "buildingId",required = false) String buildingId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId);
                 return lsit;
         }
 

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

@@ -40,9 +40,10 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
     /**
      * 微信端查询拼团和助力推首页的活动的
      * @param orgId
+     * @param buildingId
      * @return
      */
-    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId);
 
     /**
      * 列表 已开始 和 未开始

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

@@ -130,7 +130,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -207,28 +207,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,String buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
-        // 根据楼盘id查助力
-        if ("1".equals(type)){
-            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
-            helpActivityQuery.eq("building_id",buildingId);
-            helpActivityQuery.eq("org_id",orgId);
-            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-        // 根据楼盘id查拼团
-        if ("2".equals(type)){
-            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
-            taShareActivityQuery.eq("building_id",buildingId);
-            taShareActivityQuery.eq("org_id",orgId);
-            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+        // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId);
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -86,8 +86,14 @@
 				1 AS type
 			FROM
 				ta_help_activity a
-				WHERE a.is_main = 1
-				and org_id =#{orgId}
+				WHERE
+                  org_id =#{orgId}
+                <if test="buildingId  == null ">
+                  and  a.is_main = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                  and a.building_id = #{buildingId}
+                </if>
 		)
 		UNION ALL
 			(
@@ -97,8 +103,14 @@
 					2 AS type
 				FROM
 					ta_share_activity s
-					WHERE s.sort = 1
-					and org_id =#{orgId}
+					WHERE
+                        org_id =#{orgId}
+                <if test="buildingId  == null ">
+                    and  s.sort = 1
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and s.building_id = #{buildingId}
+                </if>
 			)
     </select>