bug fix

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

@@ -323,8 +323,8 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getShareType());
-            switch (e.getShareType()){
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            switch (e.getEventType()){
                 case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
@@ -348,28 +348,4 @@ public class TaPersonVisitRecordController extends BaseController {
         result.setRecords(taConsultantInfos);
         return ResponseBean.success(result);
     }
-
-    @RequestMapping(value = "/wx/sharePersonInfoList",method= RequestMethod.GET)
-    public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                           @RequestParam(value = "userId") Integer userId,
-                                           @RequestParam(value = "targetId")String targetId,
-                                           HttpServletRequest request){
-        try {
-            //使用分页插件
-            IPage<TaPerson> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPerson> result = iTaPersonVisitRecordService.getSharePersonList(pg, getOrgId(request), userId, targetId);
-            return ResponseBean.success(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    @RequestMapping(value = "/wx/judgeBindCustomer", method = RequestMethod.GET)
-    public ResponseBean judgeBindCustomer(@RequestParam("customerId")String customerId, @RequestParam("recommendPersonId") String recommendPersonId){
-        boolean judgeBindCustomerFlag = taRecommendCustomerService.judgeBindCustomer(customerId, recommendPersonId);
-        return ResponseBean.success(judgeBindCustomerFlag);
-    }
 }

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

@@ -4,47 +4,31 @@ import lombok.Data;
 
 @Data
 public class TaConsultantInfo {
-    private String targetId;
-
-    private String shareType;
+    private String activityImg;
 
-    private String buildingUrl;
+    private String activityName;
 
     private String buildingName;
 
-    private Integer buildingNum;
-
     private String address;
 
     private String price;
 
-    private String activityImg;
+    private String eventType;
 
-    private String activityName;
+    private String targetId;
 
-    private Integer activityShareNum;
+    private String buildingUrl;
 
-    private String helpActivityName;
+    private Integer buildingNum;
 
-    private String helpActivityImg;
+    private Integer activityShareNum;
 
     private Integer helpActivityShareNum;
 
-    private String groupActivityImg;
-
-    private String groupActivityName;
-
     private Integer groupActivityShareNum;
 
-    private String newsImg;
-
-    private String newsName;
-
     private Integer newsNum;
 
-    private String drainageImg;
-
-    private String drainageName;
-
     private Integer drainageShareNum;
 }

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

@@ -81,6 +81,4 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
 
     Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
-
-    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")String targetId);
 }

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

@@ -54,6 +54,4 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
 
 	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
-
-	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId);
 }

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

@@ -149,5 +149,4 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
 
-    boolean judgeBindCustomer(String customerId, String recommendPersonId);
 }

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

@@ -150,13 +150,6 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
 	}
 
-	@Override
-	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, String targetId) {
-		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
-		return result;
-	}
-
-
 	/**
 	 * 分页获取个人中心访客记录
 	 *

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

@@ -893,15 +893,4 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
     }
-
-    public boolean judgeBindCustomer(String customerId, String recommendPersonId){
-        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
-        taRecommendCustomerQueryWrapper.eq("customer_id", customerId);
-        taRecommendCustomerQueryWrapper.eq("",recommendPersonId);
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
-        if (taRecommendCustomer != null){
-            return true;
-        }
-        return false;
-    }
 }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -86,6 +86,7 @@
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
+                 order  by a.heavy desc
 		)
 		UNION ALL
 			(
@@ -112,6 +113,7 @@
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>
+                order  by s.heavy desc
 			)
 		UNION ALL
 		    (
@@ -138,6 +140,7 @@
                 <if test="buildingId != null and buildingId != ''">
                     and t.building_id = #{buildingId}
                 </if>
+                order  by t.heavy desc
             )
     </select>
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -180,35 +180,106 @@
 
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
         select
-            t.target_id,
-            t.event_type as share_type,
-            a.url as building_img,
-            a.building_name,
-            a.address,
-            a.price,
-            b.list_img_url as activity_img,
-            b.title as activity_name,
-            c.list_img as help_activity_img,
-            c.title as help_activity_name,
-            d.list_img as group_activity_img,
-            d.activity_name as group_activity_name,
-            e.news_img,
-            e.news_name,
-            f.share_img as drainage_img,
-            f.`name` as drainage_name
-        From ta_person_visit_record t
+        a.url as activity_img,
+        a.building_name as activity_name,
+        a.building_name,
+        a.address,
+        a.price,
+        t.event_type
+        from ta_person_visit_record t
         left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
+        where t.event_type = 'building'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        b.list_img_url as activity_img,
+        b.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_building_dynamic b on t.target_id = b.dynamic_id
+        where t.event_type = 'activity'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        c.list_img as activity_img,
+        c.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_help_activity c on t.target_id = c.help_activity_id
+        where t.event_type = 'help'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        d.list_img as activity_img,
+        d.activity_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_share_activity d on t.target_id = d.group_activity_id
+        where t.event_type = 'group'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        e.news_img as activity_img,
+        e.news_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_news e on t.target_id = e.news_id
+        where t.event_type = 'news'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        f.share_img as drainage_img,
+        f.`name` as drainage_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_drainage f on t.target_id = f.drainage_id
-        where
-        t.consultant_id = #{userId}
+        where t.event_type = 'h5'
+        and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
         order by t.visit_time desc
     </select>
+
     <select id="countShareNumByEventType" resultType="java.lang.Integer">
         select count(*) from ta_person_visit_record t
         where
@@ -220,20 +291,4 @@
         group by t.event_type, person_id
     </select>
 
-    <select id="getSharePersonList" resultType="com.huiju.estateagents.entity.TaPerson">
-        select
-        t.person_type,
-        t.avatarurl,
-        t.nickname,
-        a.visit_time
-        from ta_person t
-        left join ta_person_visit_record a on t.person_id = a.person_id
-        where
-        a.org_id = #{orgId}
-        and a.target_id = #{targetId}
-        and a.consultant_id = #{userId}
-        and a.person_id != a.share_person_id
-        group by a.person_id order by a.visit_time desc
-    </select>
-
 </mapper>