bug fix

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

@@ -263,16 +263,13 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,
-                                                @RequestParam(value = "targetId")String targetId,
-                                                @RequestParam(value = "eventType")String eventType,
-                                                HttpServletRequest request){
+    public ResponseBean getWxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -303,6 +300,31 @@ public class TaPersonVisitRecordController extends BaseController {
         }
     }
 
+    /**
+     * 个人中心访客记录分页查询
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/activityVisitRecord",method= RequestMethod.GET)
+    public ResponseBean wxPersonActivityVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "userId") Integer userId,
+                                                @RequestParam(value = "targetId")String targetId,
+                                                @RequestParam(value = "eventType")String eventType,
+                                                HttpServletRequest request){
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxActivityVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     /**
      * 置业顾问分享项目、活动、资讯、助力、拼团信息
      * @param pageNumber

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

@@ -74,7 +74,9 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      */
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("eventType") String eventType, @Param("shareName") String shareName, @Param("shareTel") String shareTel, @Param("buildingId") String buildingId, @Param("personType") String personType, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId, @Param("eventType")String eventType);
+    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
+
+    IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId, @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

@@ -35,7 +35,16 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
+
+	/**
+	 * 分页获取个人中心所有访客记录
+	 * @param pg
+	 * @param userId
+	 * @param orgId
+	 * @return
+	 */
+	IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
 
 	/**
 	 * 获取这个人的活动数据列表

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

@@ -183,14 +183,47 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
+	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("user_id",userId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5,taPerson.getPersonId());
+		List<TaPersonVisitRecord> records = result.getRecords();
+		//判断是否我的客户状态
+		records.forEach(e -> {
+			QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper();
+			queryWrapper.eq("realty_consultant",e.getConsultantId());
+			queryWrapper.eq("person_id",e.getPersonId());
+			TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+			if (null != taRecommendCustomer){
+				//1是我的客户
+				e.setMyCustomer(CommConstant.STATUS_NORMAL);
+			}
+		});
+		return result;
+	}
+
+
+	/**
+	 * 分页获取个人中心访客记录
+	 *
+	 * @param pg
+	 * @param userId
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public IPage<TaPersonVisitRecord> getWxActivityVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
+		//根据userId获取用户信息
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("user_id",userId);
+		taPersonQueryWrapper.eq("org_id",orgId);
+		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+		//获取我的访问客户列表
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -91,6 +91,24 @@
         select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
     </select>
     <select id="getWxVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.* ,
+	        p.`name` as user_name,
+	        p.`nickname` as nickname,
+	        p.avatarurl,
+	        d.name as activity_name,
+	        d.create_date
+        FROM
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
+            left JOIN ta_person p on t.person_id = p.person_id
+            LEFT join ta_drainage d on t.target_id = d.drainage_id
+        GROUP BY
+            t.person_id
+        ORDER BY
+	        t.visit_time DESC
+    </select>
+
+    <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
             t.* ,
 	        p.`name` as user_name,
@@ -104,6 +122,8 @@
         ORDER BY
 	        t.visit_time DESC
     </select>
+
+
     <select id="getWxVisitRecordActivityList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
             SELECT
                 t.*,