合并

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

@@ -508,12 +508,14 @@ public class HelpActivityController extends BaseController {
     @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "cityId首页专用")
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) String buildingId) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId);
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
+                                               @RequestParam(value = "cityId",required = false) String cityId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId);
                 return lsit;
         }
 

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

@@ -43,7 +43,7 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param buildingId
      * @return
      */
-    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId);
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId,@Param("cityID") String cityID);
 
     /**
      * 列表 已开始 和 未开始

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,String buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID);
 
     /**
      * 列表  已开始 和 未开始

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

@@ -207,10 +207,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID) {
         ResponseBean responseBean = new ResponseBean<>();
         // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId);
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId,cityID);
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -55,6 +55,7 @@
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
 		(
 			SELECT
+                a.city_id as cityId,
 				a.help_activity_id as activityId,
 				a.img as img,
 				1 AS type
@@ -64,6 +65,7 @@
                   org_id =#{orgId}
                 <if test="buildingId  == null ">
                   and  a.is_main = 1
+                  and  a.city_id = #{cityID}
                 </if>
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
@@ -72,6 +74,7 @@
 		UNION ALL
 			(
 				SELECT
+                    s.city_id as cityId,
 					s.group_activity_id as activityId,
 					s.main_img as img,
 					2 AS type
@@ -81,6 +84,7 @@
                         org_id =#{orgId}
                 <if test="buildingId  == null ">
                     and  s.sort = 1
+                    and  s.city_id = #{cityID}
                 </if>
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}