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

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

@@ -164,14 +164,12 @@ public class TaCustomImgController extends BaseController {
 
     /**
      * 微信接口获取首页分享或推荐客户图
-     * @param imgType
      */
     @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
-    public ResponseBean taCustomImgGet(@RequestParam(value ="imgType") String imgType,HttpServletRequest request){
+    public ResponseBean taCustomImgGet(HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("img_type", imgType);
             queryWrapper.eq("org_id", getOrgId(request));
             TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
             responseBean.addSuccess(taCustomImg);

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

@@ -323,7 +323,12 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("user_id",userId);
+            taPersonQueryWrapper.eq("org_id",getOrgId(request));
+            TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
+
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType(), taPerson.getPersonId());
             switch (e.getEventType()){
                 case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
                     e.setActivityShareNum(shareNum);
@@ -340,7 +345,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
                     e.setBuildingNum(shareNum);
                     break;
-                case CommConstant.TARGET_TYPE_H5:
+                case CommConstant.EVENT_H5:
                     e.setDrainageShareNum(shareNum);
                     break;
             }

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

@@ -80,5 +80,5 @@ 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);
+    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType, @Param("personId")String personId);
 }

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

@@ -53,5 +53,5 @@ 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);
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType, String personId);
 }

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

@@ -163,8 +163,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
-		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType, String personId) {
+		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType, personId);
 	}
 
 	/**

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -185,6 +185,7 @@
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
         select * From (
         select
+        t.target_id,
         a.url as activity_img,
         a.building_name as activity_name,
         a.building_name,
@@ -203,6 +204,7 @@
         union all
 
         select
+        t.target_id,
         b.list_img_url as activity_img,
         b.title as activity_name,
         '1' as price,
@@ -221,6 +223,7 @@
         union all
 
         select
+        t.target_id,
         c.list_img as activity_img,
         c.title as activity_name,
         '1' as price,
@@ -239,6 +242,7 @@
         union all
 
         select
+        t.target_id,
         d.list_img as activity_img,
         d.activity_name as activity_name,
         '1' as price,
@@ -257,6 +261,7 @@
         union all
 
         select
+        t.target_id,
         e.news_img as activity_img,
         e.news_name as activity_name,
         '1' as price,
@@ -275,6 +280,7 @@
         union all
 
         select
+        t.target_id,
         f.share_img as activity_img,
         f.`name` as activity_name,
         '1' as price,
@@ -292,6 +298,16 @@
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">
+		select count(1) from (
+				 SELECT
+            t.*
+        FROM
+            ( SELECT t.* FROM ta_person_visit_record t WHERE org_id = #{orgId} and target_id = #{targetId}  AND consultant_id = #{userId} and person_id != #{personId} and t.event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
+            left JOIN ta_person p on t.person_id = p.person_id
+        GROUP BY
+            t.person_id
+	        t.visit_time DESC ) t;
+        ORDER BY
         select count(DISTINCT t.person_id) from ta_person_visit_record t
         where
         t.consultant_id = #{userId}