合并

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.4</version>
+	<version>v3.5</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId());
+        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
     }
     /**
      * 查询当前所有项目

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

         dynamic.setCityId(cityId);
         //发布状态
         dynamic.setStatus(0);
-        //活动状态
+        //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
+        if (dynamic.getIsEnlist() == 0){
+            dynamic.setActivityStatus(0);
+        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
 
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
+        if (dynamic.getIsEnlist() == 0 || (LocalDateTime.now().isAfter(dynamic.getEnlistStart()) && LocalDateTime.now().isBefore(dynamic.getEnlistEnd()))){
+            dynamic.setActivityStatus(0);
+        }
+        if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
+            dynamic.setActivityStatus(1);
+        }
+        if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
+            dynamic.setActivityStatus(2);
+        }
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;

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

             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            queryWrapper.groupBy("event_type");
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);

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

                         taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
                     }
                 }
+
+                // 审核不通过的时候，移除置业顾问选择
+                if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
+                    taRecommendCustomer.setRealtyConsultant(null);
+                }
+
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
 
                     // 审核通过增加积分

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

     
     @Autowired
     private ITdPosterTemplateService tdPosterTemplateService;
-    
+
 
     /**
      * 分页查询列表
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);
             taShareActivity.setGroupActivityId(id);
+            taShareRecordService.updateActivityProcessToEndByGroupActivityId(id);
+            taShareChildRecordService.updateActivityProcessToEndByGroupActivityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

      */
     @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
+        String time = DateUtils.cutSecond(LocalDateTime.now());
 
+        //判断活动是否开始
+        iTaBuildingDynamicService.updateActivityToUnStart(time);
         //未开始活动更新为已开始
-        String time = DateUtils.cutSecond(LocalDateTime.now());
-        Integer count = iTaBuildingDynamicService.updateUnStartActivity(time);
-        System.out.println("count" + count);
-        logger.debug("JudglActivityTimeJob",count);
+        iTaBuildingDynamicService.updateUnStartActivity(time);
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();
 
+        //判断拼团活动是否开始
+        iTaShareActivityService.updateActivityToUnStart();
         //未开始拼团活动更新为已开始
         iTaShareActivityService.updateUnStartGroupActivity();
         //进行中拼团活动更新为已结束
         iTaShareRecordService.updateActivityProcessToEnd();
         iTaShareChildRecordService.updateActivityProcessToEnd();
 
+        //判断助力活动是否开始
+        iHelpActivityService.updateActivityToUnStart();
         //未开始助力活动更新为已开始
         iHelpActivityService.updateUnStartHelpActivity();
         //进行中助力活动更新为已结束

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

      */
     IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
 
+    void updateActivityToUnStart();
+
     void updateUnStartHelpActivity();
 
     void updateProcessingHelpActivity();

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

      */
     Map<String, Object> selectBuildingDynamicEnlistStatistical(@Param("orgId") Integer orgId);
 
+    /**
+     * 更新未开始的活动
+     */
+    Integer updateActivityToUnStart(@Param("curTime") String curTime);
+
     /**
      * 更新未开始的活动
      */

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

 
     List<TaPerson> getPersonByOpenId(@Param("openId") String openId);
 
-    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status);
+    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status, @Param("orgId") Integer orgId);
 
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 

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

 public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
 
+    void updateActivityToUnStart();
+
     void updateUnStartGroupActivity();
 
     void updateProcessGroupActivity();

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

     IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
     List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     void updateEndGroupActivity();
+    void updateActivityProcessToEndByGroupActivityId(@Param("groupActivityId") Integer groupActivityId);
 }

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

     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
     void updateEndGroupActivity();
-
+    void updateEndGroupActivityByGroupActivityId(@Param("groupActivityId")Integer groupActivityId);
     /**
      * 计算成团数
      * @param groupActivityId

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

      */
     List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
 
+    /**
+     * 未开始的助力活动
+     */
+    void updateActivityToUnStart();
+
     /**
      * 开始助力活动
      */

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

 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 
+    /**
+     * 判断活动是否开始
+     */
+    Integer updateActivityToUnStart(String time);
+
     /**
      * 开始未进行的活动
      */

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

      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id,String personId);
+    ResponseBean buildingAllSelectId(String id,String personId, Integer orgId);
 
 
     /**

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

 
     ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
 
+    /**
+     * 判断活动是否开始
+     */
+    void updateActivityToUnStart();
+
     /**
      * 活动未开始更新为进行中
      */

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

     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新参团者拼团失败
+	 * @param groupActivityId
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
 	/**
 	 * 微信端成为团员
 	 *

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

     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
 	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新发团者拼团失败
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
     /**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

         return lsit;
     }
 
+    @Override
+    public void updateActivityToUnStart() {
+        taHelpActivityMapper.updateActivityToUnStart();
+    }
+
     @Override
     public void updateUnStartHelpActivity() {
         taHelpActivityMapper.updateUnStartHelpActivity();

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

         timeCondition(taBuildingDynamic);
     }
 
+    @Override
+    public Integer updateActivityToUnStart(String time) {
+        return buildingDynamicMapper.updateActivityToUnStart(time);
+    }
+
     @Override
     public Integer updateUnStartActivity(String curTime) {
         return buildingDynamicMapper.updateUnStartActivity(curTime);

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

     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id,String personId) {
+    public ResponseBean buildingAllSelectId(String id,String personId, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
         IPage<TaShare> taShareList = taShareMapper.selectPage(pg, taShareQueryWrapper);
         build.setShareList(taShareList);
 
-        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL));
+        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL, build.getOrgId()));
     }
 
     @Override

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

         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+            if(null == consultant){
+                TaUser user = userService.getById(taRecommendCustomer.getRealtyConsultant());
+                consultant.setPersonId(taRecommendCustomer.getRealtyConsultant());
+                consultant.setTel(user.getPhone());
+                consultant.setPhone(user.getPhone());
+                consultant.setDepartment(user.getDepartment());
+                consultant.setUserId(user.getUserId());
+                consultant.setPost(user.getPosition());
+                consultant.setName(user.getUserName());
+                consultant.setAddress(user.getAddress());
+                consultant.setAvatarurl(user.getAvatar());
+                consultant.setCompany(user.getOrgName());
+            }
             consultant.setProjects(taPersonMapper.getUserProjects(consultant.getUserId()));
             taRecommendCustomer.setConsultant(consultant);
         }

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

         return responseBean;
     }
 
+    @Override
+    public void updateActivityToUnStart() {
+        taShareActivityMapper.updateActivityToUnStart();
+    }
+
     @Override
     public void updateUnStartGroupActivity() {
         taShareActivityMapper.updateUnStartGroupActivity();

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

         taShareChildRecordMapper.updateEndGroupActivity();
     }
 
+    @Override
+    public void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId) {
+        taShareChildRecordMapper.updateActivityProcessToEndByGroupActivityId(groupActivityId);
+    }
+
     /**
      * 微信端成为团员
      *

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

         taShareRecordMapper.updateEndGroupActivity();
     }
 
+    @Override
+    public void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId) {
+        taShareRecordMapper.updateEndGroupActivityByGroupActivityId(groupActivityId);
+    }
+
     /**
      * 分页获取微信端发起拼团记录
      *

src/main/resources/application-prod.yml

 server:
-  port: 8566
+  port: 8567
 spring:
   application:
     name: estateagents
   datasource:
     username: estateagents
     password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/HelpActivityMapper.xml

                   ha.start_date asc
     </select>
 
+    <update id="updateActivityToUnStart">
+        update ta_help_activity
+        set activity_status = 1
+        where
+        NOW() &lt;= start_date  and activity_status != 2
+    </update>
+
     <update id="updateUnStartHelpActivity">
         update ta_help_activity t
         set activity_status = 0
         update ta_help_activity t
         set activity_status = 2
         where
-             t.activity_status != '2'
-                        and NOW() > t.end_date
+        t.activity_status != '2' and NOW() > t.end_date
     </update>
 
     <select id="selectWxhelpActivityAndGroup" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaBuildingDynamicMapper.xml

         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
     </update>
 
+    <update id="updateActivityToUnStart">
+        update ta_building_dynamic
+        set activity_status = 1
+        where
+        #{curTime} &lt;= enlist_start  and activity_status != 2
+    </update>
+
     <update id="updateUnStartActivity">
         update ta_building_dynamic
         set activity_status = 0
         where
-        #{curTime} &gt;= enlist_start and  #{curTime} &lt;= enlist_end and activity_status = 1
+        #{curTime} &gt;= enlist_start and  #{curTime} &lt;= enlist_end and  activity_status != 2
     </update>
 
     <update id="updateProcessingActivity">
         update ta_building_dynamic
         set activity_status = 2
         where
-        activity_status =0 and NOW() >= end_date
+        NOW() > enlist_end and activity_status  != 2
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaChatMapper.xml

             ta_chat t
         WHERE
         (
-            (
-                t.send_person = #{from}
-                AND t.receive_person = #{to}
-            )
-            OR (
-                t.send_person = #{to}
-                AND t.receive_person = #{from}
-            )
+            t.send_person = #{to}
+            AND t.receive_person = #{from}
         )
         AND IFNULL(t.is_read, 0) = 0
     </select>

src/main/resources/mapper/TaPersonMapper.xml

             s.building_id = #{buildingId}
         AND t.person_type = #{personType}
         AND t. STATUS = #{status}
+        and t.org_id = #{orgId}
+        and u.org_id = #{orgId}
         ORDER BY
             t.create_date DESC
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         IFNULL(b.tel,d.phone) as consultTel,
         c.nickname as recommendName,
         c.tel as recommendTel,
-        (select if(ifnull(tpp.name, '') != '',tpp.name, tpp.nickname) from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.is_first_time = 1 and a.person_id = tspf.person_id) as sharePersonName
+        IFNULL(c.name,c.nickname) AS sharePersonName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-                b.*,
-                (select if(ifnull(tpp.name, '') != '',tpp.name, tpp.nickname) from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.is_first_time = 1 and b.person_id = tspf.person_id) as sharePersonName
-                FROM
-                ta_person b
+        b.*,
+        (
+        SELECT
+        IF
+        ( ifnull( tpp.NAME, '' ) != '', tpp.NAME, tpp.nickname )
+        FROM
+        ta_share_person_from tspf
+        LEFT JOIN ta_person tpp ON tspf.share_person = tpp.person_id
+        WHERE
+        tspf.is_first_time = 1
+        AND b.person_id = tspf.person_id
+        ORDER BY
+        tspf.create_date ASC
+        LIMIT 1
+        ) AS sharePersonName
+        FROM
+        ta_person b
                <where>
                     b.status > 0
                    AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
+            and a.verify_status = 1
             and realty_consultant is not null
             <if test="orgId != null">
                 and a.org_id = #{orgId}
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
+            and a.verify_status = 1
             and realty_consultant is not null
             <if test="orgId != null">
                 and a.org_id = #{orgId}

src/main/resources/mapper/TaShareActivityMapper.xml

         from ta_share_activity t where t.group_activity_id = #{activityId}
     </select>
 
+    <update id="updateActivityToUnStart">
+      update ta_share_activity
+      set activity_status = 1
+      where
+      #{curTime} &lt; start_time and activity_status != 2
+    </update>
+
     <update id="updateUnStartGroupActivity">
         update ta_share_activity t
         set activity_status = 0
-        where t.activity_status != '2'
-            and NOW() BETWEEN t.start_time and t.end_time
+        where
+        t.activity_status != '2' and NOW() BETWEEN t.start_time and t.end_time
     </update>
 
     <update id="updateProcessGroupActivity">
         update ta_share_activity
         set activity_status = 2
         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.end_time
-                ) s
-	    )
+	    NOW() > end_time and activity_status  != 2
     </update>
 
     <select id="calParticipateNum" resultType="java.lang.Integer">

src/main/resources/mapper/TaShareChildRecordMapper.xml

         where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
+    <update id="updateActivityProcessToEndByGroupActivityId">
+      <if test="groupActivityId != null and groupActivityId != ''">
+          update ta_share_child_record a set a.status = '2' where a.group_activity_id = #{groupActivityId}
+      </if>
+    </update>
+
     <select id="getList" resultType="com.huiju.estateagents.entity.TaShareChildRecord">
         select
           t.nickname,

src/main/resources/mapper/TaShareRecordMapper.xml

         where (NOW() > b.end_time or b.activity_status = '2') and a.`status` = '1' and a.status != '0'
     </update>
 
+    <update id="updateEndGroupActivityByGroupActivityId">
+        <if test="groupActivityId != '' and groupActivityId != null">
+            update ta_share_record a set a.status = '2' where a.group_activity_id = #{groupActivityId}
+        </if>
+    </update>
+
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
         t.record_id,