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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -129,7 +129,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
 				TaBuildingReport taBuildingReport = new TaBuildingReport();
 				taBuildingReport.setOrgId(taOrg.getOrgId());
-				taBuildingReport.setReportCode(e.toString());
+				taBuildingReport.setReportCode(e.getReportCode());
 				taBuildingReport.setCreateDate(LocalDateTime.now());
 
 				return taBuildingReport;

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

@@ -541,6 +541,12 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(personType)) {
+            responseBean.addSuccess("personType为空");
+            return responseBean;
+        }
+
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -568,7 +574,7 @@ public class TaPersonController extends BaseController {
                     channelPerson.setStatus(CommConstant.STATUS_NORMAL);
                     taChannelPersonService.save(channelPerson);
                 }else {
-                    responseBean.addError("渠道码错误");
+                    return ResponseBean.error("渠道码错误", ResponseBean.ERROR_UNAVAILABLE);
                 }
 
             }else {

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

@@ -1,7 +1,10 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.center.sysUser.controller.SysUserController;
 import com.huiju.estateagents.service.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -19,6 +22,8 @@ import org.springframework.stereotype.Component;
 @EnableScheduling
 public class JudglActivityTimeJob extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(JudglActivityTimeJob.class);
+
     @Autowired
     private ITaBuildingDynamicService iTaBuildingDynamicService;
 
@@ -47,7 +52,8 @@ public class JudglActivityTimeJob extends BaseController {
     private void configureTasks() {
 
         //未开始活动更新为已开始
-        iTaBuildingDynamicService.updateUnStartActivity();
+        Integer count = iTaBuildingDynamicService.updateUnStartActivity();
+        logger.debug("JudglActivityTimeJob",count);
         //进行中活动更新为已结束
         iTaBuildingDynamicService.updateProcessingActivity();
 

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

@@ -75,7 +75,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
     /**
      * 更新未开始的活动
      */
-    void updateUnStartActivity();
+    Integer updateUnStartActivity();
 
     /**
      * 更新结束的活动

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

@@ -90,7 +90,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
     /**
      * 开始未进行的活动
      */
-    void updateUnStartActivity();
+    Integer updateUnStartActivity();
 
     /**
      * 结束过期的活动

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

@@ -332,8 +332,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public void updateUnStartActivity() {
-        buildingDynamicMapper.updateUnStartActivity();
+    public Integer updateUnStartActivity() {
+        return buildingDynamicMapper.updateUnStartActivity();
     }
 
     @Override

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -3,17 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.HelpInitiateRecordMapper">
 
     <update id="updateHelpActivityProcessToEnd">
         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'

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -96,17 +96,17 @@
     </update>
 
     <update id="updateUnStartActivity">
-        update ta_building_dynamic t
+        update ta_building_dynamic
         set activity_status = 0
         where
-        t.activity_status = 1 and NOW() between  t.start_date and  t.end_date
+        NOW() &gt;= enlist_start and  NOW() &lt;= enlist_end and activity_status = 1
     </update>
 
     <update id="updateProcessingActivity">
-        update ta_building_dynamic t
+        update ta_building_dynamic
         set activity_status = 2
         where
-        t.activity_status =0 and NOW() > t.end_date
+        activity_status =0 and NOW() >= end_date
     </update>
 
     <select id="updateTaBuildingDynamic">

src/main/resources/mapper/TaChatMapper.xml

@@ -86,9 +86,7 @@
         FROM
             ta_chat t
         WHERE
-            ( t.send_person = #{personId}
-          OR t.receive_person = #{personId}
-        )
+           t.receive_person = #{personId}
         AND IFNULL(t.is_read, 0) = 0
     </select>
 </mapper>

src/main/resources/mapper/TaShareChildRecordMapper.xml

@@ -3,15 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareChildRecordMapper">
 
     <update id="updateEndGroupActivity">
         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'

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -3,17 +3,6 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareRecordMapper">
 
     <update id="updateEndGroupActivity">
         update ta_share_record a
         LEFT JOIN ta_share_activity b on a.group_activity_id = b.group_activity_id
         set a.`status` = '2'