Merge branch 'master' into dev

pom.xml

 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.16</version>
+	<version>v3.5.18</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

      */
     public static final String LOGIN_TYPE_CENTER = "center";
 
+
     /**
      * 查看分享者活动类型 h5
      */

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

             miniResp.put("name", miniapp.getName());
             miniResp.put("tpls", miniAppService.getTpls(appid));
 
-            //如果是分享进来且没有进入过小程序，给分享人发放积分
-            QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-            personQueryWrapper.eq("mini_openid", session.getOpenid());
-            personQueryWrapper.eq("org_id", orgId);
-            int count = taPersonService.count(personQueryWrapper);
+            // 2020年3月30日 与曹建芳讨论 去掉此规则
+//            //如果是分享进来且没有进入过小程序，给分享人发放积分
+//            QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+//            personQueryWrapper.eq("mini_openid", session.getOpenid());
+//            personQueryWrapper.eq("org_id", orgId);
+//            int count = taPersonService.count(personQueryWrapper);
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
             // 增加积分线程
             ExecutorService threadPool = Executors.newCachedThreadPool();
             threadPool.execute(() -> {
-                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
                     // 校验是否点击过此人的分享
                     boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
                     if (checkPoint) {

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

 
     List<TaShare> listLiveShare(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("liveActivityId")Integer liveActivityId);
 
-    List<Map<String, Object>> statTopShare(@Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
+    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
 }

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

 
     /**
      * 统计分享 Top
+     *
+     * @param orgId
      * @param targetType
      * @param targetId
      * @param top
      * @return
      */
-    List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top);
+    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top);
 }

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

 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaShareService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
     }
 
     @Override
-    public List<Map<String, Object>> statTopShare(String targetType, String targetId, Integer top) {
-        return taShareMapper.statTopShare(targetType, targetId, top);
+    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top) {
+        return taShareMapper.statTopShare(orgId, targetType, targetId, top);
     }
 
     List<TaPerson> getPersonsByOpenId(String openid) {

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

             @RequestParam (required = false, defaultValue = "10") Integer top
     ) {
         // 暂时没有任何校验
+        QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+        queryWrapper.eq("target_id", h5Id);
+        queryWrapper.last("limit 1");
 
-        List<Map<String, Object>> res = taShareService.statTopShare("h5_share", h5Id, top);
+        TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
+
+        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top);
         return ResponseBean.success(res);
     }
 }

src/main/resources/mapper/TaShareMapper.xml

 
     <select id="statTopShare" resultType="java.util.Map">
         SELECT
-            *
+            a.top,
+            s.person_id AS sharePerson,
+            s.nickname,
+            s.avatarurl,
+            IFNULL( s.tel, s.phone ) AS phone
         FROM
         (
             SELECT
-                t.share_person as sharePerson,
-                s.nickname,
-                s.avatarurl,
-                IFNULL(s.tel,s.phone) as phone,
+                t.share_person,
                 COUNT( 1 ) AS top
             FROM
                 ta_share_person_from t
-                LEFT JOIN ta_person s ON t.org_id = s.org_id and (t.share_person = s.person_id or t.share_person = s.user_id)
             WHERE
-                t.target_type = #{targetType}
+                t.org_id = #{orgId}
+                AND t.target_type = #{targetType}
                 AND t.target_id = #{targetId}
                 AND t.is_first_time = 1
-        GROUP BY
+            GROUP BY
                 t.share_person
-        ) AS t
             ORDER BY
-            t.top DESC
+                COUNT( 1 ) DESC
             LIMIT #{top}
+        ) a
+        LEFT JOIN ta_person s ON s.org_id = #{orgId}
+            AND ( a.share_person = s.person_id OR a.share_person = s.user_id )
     </select>
 </mapper>