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

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

 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            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());
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
             switch (e.getEventType()){
                 case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
                     e.setActivityShareNum(shareNum);

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

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

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

 
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
 
-	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType, String personId);
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
 }

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

 	}
 
 	@Override
-	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType, String personId) {
-		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType, personId);
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
+		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
 	}
 
 	/**

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

 
 		// 发放积分
 		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
+		if (null != taPerson && savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}

src/main/resources/mapper/HelpActivityMapper.xml

                 a.end_date as endDate,
                 a.`status` as status,
                 a.activity_status as activityStatus,
-				"help" AS type
+				"help" AS type,
+                a.heavy
 			FROM
 				ta_help_activity a
 				WHERE
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
-                 order  by a.heavy desc
 		)
 		UNION ALL
 			(
                     s.end_time as endDate,
                     s.status as status,
                     s.activity_status as activityStatus,
-					"group" AS type
+					"group" AS type,
+                    s.heavy
 				FROM
 					ta_share_activity s
 					WHERE
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>
-                order  by s.heavy desc
 			)
 		UNION ALL
 		    (
                 t.end_date as endDate,
                 t.status as status,
                 t.activity_status as activityStatus,
-                "activity" AS type
+                "activity" AS type,
+                t.heavy
                 FROM
                 ta_building_dynamic t
                 WHERE
                 <if test="buildingId != null and buildingId != ''">
                     and t.building_id = #{buildingId}
                 </if>
-                order  by t.heavy desc
             )
+            order by heavy
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

             left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
             left join ta_person c on t.share_person_id = c.person_id
             where
-            1=1
+            t.share_person_id is not null and t.share_person_id != ''
             <if test="orgId != null and orgId != ''">
                 and t.org_id = #{orgId}
             </if>
         where t.event_type = 'news'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        group by t.target_id
         and t.`event` = 'share'
+        group by t.target_id
 
         union all
 
     </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
+        select count(DISTINCT t.person_id)  from ta_person_visit_record t
         where
         t.consultant_id = #{userId}
         and t.org_id = #{orgId}