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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.1.0</version>
+	<version>v3.5.2.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -372,7 +372,7 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
             taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
             taUserQueryWrapper.eq(null != status,"status",status);
-            taUserQueryWrapper.ne("status", 9);
+//            taUserQueryWrapper.ne("status", 9);
             if(null != isConsultant && isConsultant == 1){
                 taUserQueryWrapper.eq("is_consultant",true);
             }else if (null != isConsultant && isConsultant == 0){

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

@@ -8,17 +8,10 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaExtendContent;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaExtendContentService;
-import org.omg.CORBA.PUBLIC_MEMBER;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>

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

@@ -204,7 +204,7 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
-    
+
     /**
      * 盘客工具分页获取访问记录
      * @param pageNumber
@@ -227,6 +227,27 @@ public class TaPersonVisitRecordController extends BaseController {
         }
     }
 
+    @RequestMapping(value="/admin/taDrainageVisitRecord", method = RequestMethod.GET)
+    public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="activityName",required = false) String activityName,
+                                                @RequestParam(value ="drainageId",required = false) Integer drainageId,
+                                                @RequestParam(value ="shareName",required = false) String shareName,
+                                                @RequestParam(value ="shareTel",required = false) String shareTel,
+                                                HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel);
+            responseBean.addSuccess(result);
+            return responseBean;
+        } catch (Exception e) {
+            logger.error("drainageVisitRecord -=- {}", e.toString());
+        }
+        return responseBean;
+    }
+
     /**
      * 个人中心访客记录分页查询
      * @param pageNumber

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

@@ -90,6 +90,12 @@ public class TaPersonVisitRecord implements Serializable {
     @TableField(exist = false)
     private String userName;
 
+    /**
+     * 用户手机号
+     */
+    @TableField(exist = false)
+    private String userTel;
+
     /**
      * 事件名称
      */
@@ -115,7 +121,24 @@ public class TaPersonVisitRecord implements Serializable {
     private String activityName;
 
     /**
-     * 1是我的客户
+     * 分享者userId
+     */
+    @TableField(exist = false)
+    private Integer sharePersonId;
+
+    /**
+     * 分享者名称
+     */
+    @TableField(exist = false)
+    private String shareName;
+
+    /**
+     * 分享者手机
+     */
+    @TableField(exist = false)
+    private String shareTel;
+
+    /** 1是我的客户
      */
     @TableField(exist = false)
     private Integer myCustomer;

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

@@ -63,6 +63,13 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      */
 	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg,@Param("personId") String personId);
 
+    /**
+     * 获取引流信息访问记录
+     * @param pg
+     * @param orgId
+     * @return
+     */
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel);
     IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType);
 
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);

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

@@ -45,4 +45,6 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
+
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel);
 }

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

@@ -10,12 +10,10 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**

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

@@ -1,5 +1,10 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -57,8 +62,13 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	private TaNewsMapper taNewsMapper;
 
 	@Autowired
+	private TaUserMapper taUserMapper;
+
+	@Autowired
+	private TaPersonMapper taPersonMapper;
+
 	private TaDrainageMapper taDrainageMapper;
-	
+
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -113,6 +123,26 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		return result;
 	}
 
+	@Override
+	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel) {
+		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel);
+		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
+		taPersonVisitRecords.forEach(e -> {
+			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
+			if (personInfo != null){
+				e.setUserName(personInfo.getNickname());
+				e.setUserTel(personInfo.getPhone());
+			}
+
+			TaUser userShareInfo = taUserMapper.selectById(e.getSharePersonId());
+			if (userShareInfo != null){
+				e.setShareName(userShareInfo.getUserName());
+				e.setShareTel(userShareInfo.getPhone());
+			}
+		});
+		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
+		return taPersonVisitRecordIPage;
+	}
 	/**
 	 * 分页获取个人中心访客记录
 	 *

src/main/resources/mapper/TaPersonMapper.xml

@@ -554,6 +554,6 @@ FROM
     <select id="judgeBindStatusByCondition" resultType="java.lang.Integer">
         select count(1) from ta_user a
         LEFT JOIN ta_person b on a.user_id = b.user_id
-        where a.org_id = #{orgId} and b.user_id = #{userId} and a.phone = #{phone} and b.person_type = 'Realty Consultant'
+        where a.org_id = #{orgId} and b.user_id = #{userId} and a.phone = #{phone} and a.is_consultant = '1'
     </select>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -1,6 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonVisitRecordMapper">
+
+    <sql id="columnSql">
+        <trim suffixOverrides=",">
+            t.record_id,
+            t.person_id,
+            t.person_type,
+            t.visit_time,
+            t.leave_time,
+            t.visit_duration,
+            t.event,
+            t.data,
+            t.activity,
+            t.org_id,
+            t.building_id,
+            t.event_type,
+            t.target_id,
+            t.consultant_id,
+            t.share_person_id,
+        </trim>
+    </sql>
+
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from ta_person_visit_record
         where person_id = #{personId}
@@ -102,4 +123,32 @@
             t.visit_time DESC
     </select>
 
+    <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        select
+        <include refid="columnSql"></include>,
+        b.name as activityName
+        from ta_person_visit_record t
+        left join ta_drainage b on t.target_id = b.drainage_id
+        where
+        t.event_type = 'h5'
+        and t.share_person_id is not null
+        <if test="orgId != null and orgId != ''">
+            and t.org_id = #{orgId}
+        </if>
+        <if test="drainageId !=null and drainageId != ''">
+            and b.drainage_Id = #{drainageId}
+        </if>
+        <if test="activityName !=null and activityName != ''">
+            and b.name like concat('%',#{activityName},'%')
+        </if>
+        <if test="shareName !=null and shareName != ''">
+            and t.data like concat('%',#{shareName},'%')
+        </if>
+        <if test="shareTel !=null and shareTel != ''">
+            and t.data like concat('%',#{shareTel},'%')
+        </if>
+        group by t.person_id, t.share_person_id
+        order by t.visit_time desc
+    </select>
+
 </mapper>