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

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

@@ -474,10 +474,12 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCustomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id,
+                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -486,10 +488,12 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
-    public ResponseBean getPublicCustomerDetail(@PathVariable String id) {
+    public ResponseBean getPublicCustomerDetail(@PathVariable String id,
+                                                @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());

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

@@ -57,6 +57,11 @@ public class TaGoods implements Serializable {
      */
     private String imgUrl;
 
+    /**
+     * 商品详情图
+     */
+    private String detailImgUrl;
+
     /**
      * 商品总数
      */

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

@@ -7,6 +7,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -187,7 +188,7 @@ public class TaPerson implements Serializable {
      * 访问记录
      */
     @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
+    private IPage<TaPersonVisitRecord> visitRecords;
 
     @TableField(exist = false)
     private List<String> projects;

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

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -154,7 +155,7 @@ public class TaRecommendCustomer implements Serializable {
     private Integer orgId;
 
     @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
+    private IPage<TaPersonVisitRecord> visitRecords;
 
     @TableField(exist = false)
     private List<String> projects;
@@ -179,7 +180,8 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private List<PersonIntention> intentions;
-
+    
+    @TableField(exist = false)
     private String intentionName;
 
 

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

@@ -86,11 +86,6 @@ public class TaShareRecord implements Serializable {
      */
     private Integer verificationStatus;
 
-    /**
-     * 权重，用于排序
-     */
-    private Integer heavy;
-
     /**
      * 核销码
      */

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

@@ -50,7 +50,7 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "* 50 23 * * ?")
+    @Scheduled(cron = "00 50 23 * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
     

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

@@ -24,7 +24,7 @@ import java.util.List;
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
 
-    List<TaPersonVisitRecord> visitRecordByPersonId(@Param("personId") String personId);
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
 
     /**
      * 行为分析的 列表

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

@@ -42,9 +42,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize);
 
-    TaPerson getPublicCustomerDetail(String personId);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize);
 
     TaRecommendCustomer getCustomerById(String customerId);
 

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

@@ -11,10 +11,7 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
@@ -438,13 +435,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
@@ -472,11 +470,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
         return taRecommendCustomer;

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

@@ -52,4 +52,6 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @return
 	 */
 	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
+	
+	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
 }

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

@@ -98,6 +98,9 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	 * @param customerType
 	 */
 	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+		//先删除当天数据在添加防止有脏数据
+		customerStatisticDailyMapper.deleteNowDate(nowDate,customerType);
+		
 		list.forEach(e -> {
 			e.setCreateDate(nowDate);
 			e.setCustomerType(customerType);

src/main/resources/mapper/TaBuildingDynamicMapper.xml

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

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -19,7 +19,7 @@
       update ta_share_activity
       set activity_status = 1
       where
-      #{curTime} < start_time and activity_status != 2
+      NOW() < start_time and activity_status != 2
     </update>
 
     <update id="updateUnStartGroupActivity">

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

@@ -2,6 +2,12 @@
 <!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.TaCustomerStatisticDailyMapper">
 
+    <delete id="deleteNowDate">
+        delete from ta_customer_statistic_daily
+        where customer_type = #{customerType}
+        AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+    </delete>
+
     <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
         SELECT
             org_id,