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

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

 package com.huiju.estateagents.controller;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
-import com.huiju.estateagents.mapper.TaShareMapper;
+import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.*;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
-import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    private IHelpActivityService helpActivityService;
+
+    @Autowired
+    private ITaShareActivityService taShareActivityService;
+
+    @Autowired
+    private ITaLiveActivityService taLiveActivityService;
+
+    @Autowired
+    private ITaDrainageService taDrainageService;
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
     /**
      * 验证接入
      */
                 } else if (from.contains("building")) {
                     taSharePersonFrom.setBuildingId(targetId);
                     sharePersonFromQueryWrapper.eq("building_id", targetId);
+                }else if (from.contains("help")) {
+                    HelpActivity helpActivity = helpActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(helpActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", helpActivity.getBuildingId());
+                }else if (from.contains("group")) {
+                    TaShareActivity taShareActivity = taShareActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(taShareActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taShareActivity.getBuildingId());
+                }else if (from.contains("live")) {
+                    TaLiveActivity liveActivity = taLiveActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(liveActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", liveActivity.getBuildingId());
+                }else if (from.contains("h5")) {
+                    TaDrainage taDrainage = taDrainageService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(taDrainage.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taDrainage.getBuildingId());
+                }else if (from.contains("house")) {
+                    TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(targetId);
+                    taSharePersonFrom.setBuildingId(taSalesBatch.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taSalesBatch.getBuildingId());
                 }
                 Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
                 if (isFirstTime > 0) {

src/main/java/com/huiju/estateagents/excel/IntentionUser.java

     @ExcelProperty(value = "置业顾问电话", index = 6)
     private String realtyConsultantPhone;
 
-    /**
-     * 分享者
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者", index = 7)
-    private String sharePersonName;
-
-    /**
-     * 分享者电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者电话", index = 8)
-    private String sharePersonPhone;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
 
     /**
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 9)
+    @ExcelProperty(value = "性别", index = 7)
     private String gender;
 
     /**
      * 来源
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "用户来源", index = 10)
+    @ExcelProperty(value = "用户来源", index = 8)
     private String personFrom;
 
     /**
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index =11)
+    @ExcelProperty(value = "推广人", index = 9)
     private String recommendPerson;
 
 }

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

         ORDER BY SUM(tpir.intention) DESC
     </select>
     <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
-        select t.*, IFNULL(b.nickname, c.user_name) as sharePersonName, ifnull(b.phone, c.phone) as sharePersonPhone, b1.scene_alias as personFrom, e.nickname as recommendPerson
+        select t.*, b1.scene_alias as personFrom, e.nickname as recommendPerson
         From (
 
         SELECT
 
         FROM ta_person_intention_record tpir
         LEFT JOIN ta_person tp ON tpir.person_id = tp.person_id
-        left join ta_recommend_customer c on c.person_id = tpir.person_id
+        left join ta_recommend_customer c on c.person_id = tpir.person_id and c.building_id = tpir.building_id
         left join ta_user d on c.realty_consultant = d.user_id
         <trim prefix="where" prefixOverrides="and | or">
             <if test="orgId != null">
 
         ) as t
         left join ta_share_person_from a on t.person_id = a.person_id
-        left join ta_user c on a.share_person = c.user_id
-        left join ta_person b on a.share_person = b.person_id
-        left join ta_person_from_record d on t.person_id = d.share_person_id and d.is_first_time = 1 and d.org_id = #{orgId}
+        left join ta_person_from_record d on t.person_id = d.person_id and d.is_first_time = 1 and d.org_id = #{orgId}
         left join td_wx_dict b1 on d.scene_id = b1.scene_id
-        left join ta_person e on d.person_id = e.person_id
+        left join ta_person e on d.share_person_id = e.person_id
 
         <trim prefix="where" prefixOverrides="and | or">
             <if test="buildingId != null and buildingId != ''">

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

         ) as activity
 
         left join (
-            SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
+            select count(1) as shareNum, a.* from (
+            SELECT a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
             FROM ta_share_count a where a.tagert_type in (
             'activity', 'group','h5','help','liveApp','livePost')
             and a.org_id = #{orgId}
             <if test="startDate == null or endDate == null ">
                 AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
+            order by a.create_date desc limit 9999999) as a group by a.be_share,a.tagert_type order by a.create_date desc
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
         </if>
         group by activity.activityId, activity.activityType
         <if test="colKey == null or colKey == ''">
-            order by sharePersonNum.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sortType}
         ) as activity
 
         left join (
-        SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
+        select count(1) as shareNum, a.* from (
+
+        SELECT a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
         FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
+        order by a.create_date desc limit 9999999) as a group by a.be_share,a.tagert_type order by a.create_date desc
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
         </if>
         group by activity.activityId, activity.activityType
         <if test="colKey == null or colKey == ''">
-            order by sharePersonNum.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sortType}
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        group_concat(d.phone) as realtyConsultantPhone,
         ifnull(e.nickname, f.name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        group_concat(d.phone) as realtyConsultantPhone,
         ifnull(e.nickname, f.name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t