Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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/controller/TaBuildingDynamicController.java

@@ -161,7 +161,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -176,6 +176,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private String intentionName;
+
     /**
      * 推广人
      */

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/ITaBuildingDynamicService.java

@@ -83,7 +83,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 

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/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -357,9 +357,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
         if(!StringUtils.isEmpty(building)){
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
         }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -38,44 +38,18 @@
     </select>
 
     <update id="updateUnStartHelpActivity">
-        update ta_help_activity
+        update ta_help_activity t
         set activity_status = 0
         where
-        help_activity_id in (
-            select
-            help_activity_id
-            from
-            (
-            select
-            t.help_activity_id
-            from
-            ta_help_activity t
-            where
-            t.activity_status != '2'
-            and NOW() > t.start_date
-            and NOW() &lt; t.end_date
-            ) s
-        )
+        t.activity_status != '2' and NOW() BETWEEN t.start_date  and t.end_date
     </update>
 
     <update id="updateProcessingHelpActivity">
-        update ta_help_activity
+        update ta_help_activity t
         set activity_status = 2
         where
-            help_activity_id in (
-                select
-                    help_activity_id
-                from
-                    (
-                        select
-                            t.help_activity_id
-                        from
-                            ta_help_activity t
-                        where
-                            t.activity_status != '2'
+             t.activity_status != '2'
                         and NOW() > t.end_date
-                    ) s
-            )
     </update>
 
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">
@@ -86,8 +60,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 +77,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>
 

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -3,17 +3,21 @@
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
 
     <update id="updateHelpActivityProcessToEnd">
-      update ta_help_initiate_record a
-        set a.`status` = '2'
-        where
-            a.help_activity_id in (
-                select
-                    t.help_activity_id
-                from
-                    ta_help_activity t
-                where (NOW() > t.end_date or t.activity_status = '2')
-            )
-        and a.`status` = '1'
+--       update ta_help_initiate_record a
+--         set a.`status` = '2'
+--         where
+--             a.help_activity_id in (
+--                 select
+--                     t.help_activity_id
+--                 from
+--                     ta_help_activity t
+--                 where (NOW() > t.end_date or t.activity_status = '2')
+--             )
+--         and a.`status` = '1'
+        update ta_help_initiate_record a
+        left join ta_help_activity b on a.help_activity_id = b.help_activity_id
+        set a.status = '2'
+        where  (NOW() > b.end_date or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="selectPageList" resultType="com.huiju.estateagents.entity.HelpInitiateRecord">

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -96,44 +96,17 @@
     </update>
 
     <update id="updateUnStartActivity">
-        update ta_building_dynamic
+        update ta_building_dynamic t
         set activity_status = 0
         where
-        dynamic_id in (
-            select
-            dynamic_id
-            from
-            (
-            select
-            t.dynamic_id
-            from
-            ta_building_dynamic t
-            where
-            t.activity_status != '2'
-            and NOW() > t.create_date
-            and NOW() &lt; t.end_date
-            ) s
-        )
+        t.activity_status = 1 and NOW() between  t.create_date and  t.end_date
     </update>
 
     <update id="updateProcessingActivity">
-        update ta_building_dynamic
+        update ta_building_dynamic t
         set activity_status = 2
         where
-            dynamic_id in (
-                select
-                    dynamic_id
-                from
-                    (
-                        select
-                            t.dynamic_id
-                        from
-                            ta_building_dynamic t
-                        where
-                            t.activity_status != '2'
-                        and NOW() > t.end_date
-                    ) s
-            );
+        t.activity_status =0 and NOW() > t.end_date
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -106,10 +106,12 @@ FROM
         a.*,
         a.customer_id AS customerId,
         b.NAME AS consultantName,
-        b.tel AS consultTel
+        b.tel AS consultTel,
+        c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -16,24 +16,10 @@
     </select>
 
     <update id="updateUnStartGroupActivity">
-        update ta_share_activity
+        update ta_share_activity t
         set activity_status = 0
-        where
-        group_activity_id in (
-            select
-            group_activity_id
-            from
-            (
-            select
-            t.group_activity_id
-            from
-            ta_share_activity t
-            where
-            t.activity_status != '2'
-            and NOW() > t.start_time
-            and NOW() &lt; t.end_time
-            ) s
-        )
+        where t.activity_status != '2'
+            and NOW() BETWEEN t.start_time and t.end_time
     </update>
 
     <update id="updateProcessGroupActivity">

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -3,15 +3,19 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
 
     <update id="updateEndGroupActivity">
+--         update ta_share_child_record a
+--         set a.`status` = '2'
+--         where a.group_activity_id in (
+--             select
+--                     t.group_activity_id
+--                 from
+--                     ta_share_activity t
+--                 where (NOW() > t.end_time or t.activity_status = '2')
+--         ) and a.`status` = '1';
         update ta_share_child_record a
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'
-        where a.group_activity_id in (
-            select
-                    t.group_activity_id
-                from
-                    ta_share_activity t
-                where (NOW() > t.end_time or t.activity_status = '2')
-        ) and a.`status` = '1';
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -3,17 +3,21 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
 
     <update id="updateEndGroupActivity">
+--         update ta_share_record a
+--         set a.`status` = '2'
+--         where
+--             a.group_activity_id in (
+--                 select
+--                     t.group_activity_id
+--                 from
+--                     ta_share_activity t
+--                 where (NOW() > t.end_time or t.activity_status = '2')
+--             )
+--         and a.`status` = '1';
         update ta_share_record a
+        LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'
-        where
-            a.group_activity_id in (
-                select
-                    t.group_activity_id
-                from
-                    ta_share_activity t
-                where (NOW() > t.end_time or t.activity_status = '2')
-            )
-        and a.`status` = '1';
+        where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">