* 新功能

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

@@ -721,7 +721,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         packages.setCreateDate(taUser.getCreateDate());
         packages.setStartDate(taUser.getCreateDate());
         packages.setEndDate(taUser.getExpDate());
-        packages.setRuleId(CommConstant.SYS_ROLE_TRIAL);  // 内置试用角色
+        packages.setRoleId(CommConstant.SYS_ROLE_TRIAL);  // 内置试用角色
         packages.setStatus(CommConstant.STATUS_NORMAL);
 
         taUserPackagesMapper.insert(packages);

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

@@ -1,13 +1,8 @@
 package com.huiju.estateagents.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
@@ -16,9 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -53,8 +46,8 @@ public class TaPersonFromRecordController extends BaseController {
     public ResponseBean taPersonFromRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
-        iTaPersonFromRecordService.personFromStatistic();
-        iTsUserBehaviorStatisticService.userBehaviorStatustic();
+        iTaPersonFromRecordService.personFromStatistic(LocalDateTime.now());
+        iTsUserBehaviorStatisticService.userBehaviorStatustic(LocalDateTime.now());
         responseBean.addSuccess("成功");
         return responseBean;
     }

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

@@ -50,10 +50,10 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "59 50 23 * * ?")
-//    @Scheduled(cron = "* 0/1 * * * ?")
-    private void configureTasks() {
-        LocalDateTime nowDate = LocalDateTime.now();
+//    @Scheduled(cron = "59 50 23 * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void configureTasks() {
+        LocalDateTime nowDate = LocalDateTime.now().plusDays(-8);
 
         //每天的新增客户统计并入表
         customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
@@ -83,10 +83,10 @@ public class CustomerStatisticTimeJob extends BaseController {
         customerStatisticMonthlyService.visiteStatisticMonthly(nowDate);
 
         //统计新增来源用户
-        iTaPersonFromRecordService.personFromStatistic();
+        iTaPersonFromRecordService.personFromStatistic(nowDate);
 
         //统计用户行为数据
-        iTsUserBehaviorStatisticService.userBehaviorStatustic();
+        iTsUserBehaviorStatisticService.userBehaviorStatustic(nowDate);
     }
 
 }

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

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+    @Scheduled(cron = "0 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

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

@@ -5,6 +5,7 @@ import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -18,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface TaPersonFromRecordMapper extends BaseMapper<TaPersonFromRecord> {
 
-    List<TsPersonFromStatistic> getNowDataList();
+    List<TsPersonFromStatistic> getNowDataList(LocalDateTime nowDate);
 }

src/main/java/com/huiju/estateagents/miniPackage/entity/TaUserPackages.java

@@ -3,12 +3,13 @@ package com.huiju.estateagents.miniPackage.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 会员套餐记录 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 新增用户来源表  服务类
@@ -19,5 +21,5 @@ public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord>
     /**
      * 定时任务批量保存数据
      */
-    void personFromStatistic();
+    void personFromStatistic(LocalDateTime nowDate);
 }

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

@@ -2,7 +2,6 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonFromRecord;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
@@ -72,9 +71,9 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
      * 定时任务批量保存数据
      */
     @Override
-    public void personFromStatistic() {
-        List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
-        tsPersonFromStatisticMapper.deleteByData();
+    public void personFromStatistic(LocalDateTime nowDate) {
+        List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList(nowDate);
+        tsPersonFromStatisticMapper.deleteByData(nowDate);
         tsPersonFromStatisticMapper.insertStatisticList(list);
     }
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
 
     List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
-    void deleteByData();
+    void deleteByData(LocalDateTime nowDate);
 
     List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -20,9 +21,9 @@ import java.util.List;
 @Mapper
 public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehaviorStatistic> {
 
-    List<TsUserBehaviorStatistic> seleUserBehaviorList();
+    List<TsUserBehaviorStatistic> seleUserBehaviorList(LocalDateTime nowDate);
 
-    int deleteByDate();
+    int deleteByDate(LocalDateTime nowDate);
 
     List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITsUserBehaviorStatisticService.java

@@ -5,6 +5,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -16,7 +17,7 @@ import java.time.LocalDate;
  */
 public interface ITsUserBehaviorStatisticService extends IService<TsUserBehaviorStatistic> {
 
-    void userBehaviorStatustic();
+    void userBehaviorStatustic(LocalDateTime nowDate);
 
     /**
      * 按日期获取统计列表

src/main/java/com/huiju/estateagents/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -1,10 +1,7 @@
 package com.huiju.estateagents.statistic.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TdBizEvent;
-import com.huiju.estateagents.entity.TdBizEventType;
 import com.huiju.estateagents.mapper.TdBizEventTypeMapper;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
@@ -14,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,11 +34,11 @@ public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehavi
     private TdBizEventTypeMapper tdBizEventTypeMapper;
 
     @Override
-    public void userBehaviorStatustic() {
+    public void userBehaviorStatustic(LocalDateTime nowDate) {
         //查询当天信息
-        List<TsUserBehaviorStatistic> list = tsUserBehaviorStatisticMapper.seleUserBehaviorList();
+        List<TsUserBehaviorStatistic> list = tsUserBehaviorStatisticMapper.seleUserBehaviorList(nowDate);
         //删除当天信息
-        tsUserBehaviorStatisticMapper.deleteByDate();
+        tsUserBehaviorStatisticMapper.deleteByDate(nowDate);
         //批量插入信息
         this.saveBatch(list);
     }

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -15,7 +15,7 @@
             LEFT JOIN ta_person p ON t.person_id = p.person_id
         WHERE
             t.is_first_time = 1
-            AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+            AND DATE_FORMAT( t.create_date, '%Y-%m-%d' ) = DATE_FORMAT(  #{nowDate}, '%Y-%m-%d' )
         GROUP BY
             t.scene_type,
             t.event_type,

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -10,7 +10,7 @@
         </foreach>
     </insert>
     <delete id="deleteByData">
-        delete from ts_person_from_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+        delete from ts_person_from_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT(  #{nowDate}, '%Y-%m-%d' )
     </delete>
     <select id="selectPersonFrom" resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
         SELECT

src/main/resources/mapper/statistic/TsUserBehaviorStatisticMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.statistic.mapper.TsUserBehaviorStatisticMapper">
     <delete id="deleteByDate">
-        delete from ts_user_behavior_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+        delete from ts_user_behavior_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT(  #{nowDate}, '%Y-%m-%d' )
     </delete>
 
     <select id="seleUserBehaviorList"
@@ -17,7 +17,7 @@
         FROM
             (
         SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( DATE_SUB(  #{nowDate}, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
             b.type_id,
             b.type_name,
             a.rownum
@@ -43,7 +43,7 @@
             tp.org_id,
             tpvr.building_id
             ) AS temp ON temp_date.date = temp.date
-            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
+            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT(  #{nowDate}, '%Y-%m-%d' )
     </select>
     <select id="seleBehaviorListByDate"
             resultType="com.huiju.estateagents.po.PersonPO">

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -1,18 +1,20 @@
 package com.huiju.estateagents;
 
+import com.huiju.estateagents.job.CustomerStatisticTimeJob;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Random;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Transactional
 public class WxPayTest {
 
+    @Autowired
+    private CustomerStatisticTimeJob customerStatisticTimeJob;
     @Test
     public void getLocationCity() {
 //        try {
@@ -28,11 +30,10 @@ public class WxPayTest {
 //        }catch (Exception e) {
 //            e.printStackTrace();
 //        }
-        Random random = new Random();
-        for (int i =0; i <100 ; i++){
-            System.out.println(random.nextInt(5)%(5-1 + 1) +1);
-        }
-
-
+//        Random random = new Random();
+//        for (int i =0; i <100 ; i++){
+//            System.out.println(random.nextInt(5)%(5-1 + 1) +1);
+//        }
+        customerStatisticTimeJob.configureTasks();
     }
 }