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

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

@@ -165,6 +165,7 @@ public class TaPersonController extends BaseController {
             person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
+            queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
             if (null == channel){
                 return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
@@ -557,6 +558,7 @@ public class TaPersonController extends BaseController {
             if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
                 channelQueryWrapper.eq("channel_code",channelCode);
+                channelQueryWrapper.eq("org_id",getOrgId(request));
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
                 List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
                 if(channel.size()>0){

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.center.sysUser.controller.SysUserController;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +12,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+
 /**
  * @author admin
  * @Title: JudglActivityTimeJob
@@ -52,7 +55,9 @@ public class JudglActivityTimeJob extends BaseController {
     private void configureTasks() {
 
         //未开始活动更新为已开始
-        Integer count = iTaBuildingDynamicService.updateUnStartActivity();
+        String time = DateUtils.cutSecond(LocalDateTime.now());
+        Integer count = iTaBuildingDynamicService.updateUnStartActivity(time);
+        System.out.println("count" + count);
         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> {
     /**
      * 更新未开始的活动
      */
-    Integer updateUnStartActivity();
+    Integer updateUnStartActivity(@Param("curTime") String curTime);
 
     /**
      * 更新结束的活动

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

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

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

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

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -99,7 +99,7 @@
         update ta_building_dynamic
         set activity_status = 0
         where
-        NOW() >= enlist_start and  NOW() <= enlist_end and activity_status = 1
+        #{curTime} >= enlist_start and  #{curTime} <= enlist_end and activity_status = 1
     </update>
 
     <update id="updateProcessingActivity">