Merge branch 'dev'

# Conflicts:
#	src/main/resources/mapper/TaRecommendCustomerMapper.xml

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.21</version>
+	<version>v3.5.28</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -129,6 +129,12 @@
 			<version>2.7.0</version>
 		</dependency>
 
+        <!-- aop 依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
 
 		<dependency>
 			<groupId>fadada</groupId>

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 
@@ -140,3 +141,4 @@ public class BaseController {
         return taPersonBuildingList;
     }
 }
+

src/main/java/com/huiju/estateagents/bo/request/QrCodeStatisticResponseBO.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 二维码统计返回实体
+ *
+ * @author gusy
+ * @date 2020/5/21 13:53
+ */
+@Data
+public class QrCodeStatisticResponseBO {
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+}

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

@@ -206,6 +206,17 @@ public class CommConstant {
      */
     public static final String BANNER_INDEX = "index";
 
+    /**
+     * 首屏广告_发布位置——项目
+     */
+    public static final String BANNER_BUILDING = "building";
+
+    //首页资讯
+    public static final String INDEX_NEWS = "indexNews";
+
+    //首页分享类型
+    public static final String IMG_TYPE = "imgType";
+
     //=================  首屏广告 / 轮播图 end =======================
 
     /**
@@ -541,6 +552,13 @@ public class CommConstant {
      */
     public static final String HOUSE = "house";
 
+
+    /**
+     * 首页分享
+     */
+    public static final String INDEX = "index";
+
+
     /**
      * 批量销售
      */

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

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.common;
+
+/**
+ * 小程序页面枚举
+ *
+ * @author gusy
+ * @date 2020/5/21 15:58
+ */
+public enum MiniAppPageEnum {
+
+    /**
+     * 项目
+     */
+    PROJECT("project", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+
+    /**
+     * 报名活动
+     */
+    ACTIVITY("activity", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+
+    /**
+     * 助力活动
+     */
+    HELP("help", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP("group", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+
+    /**
+     * h5活动
+     */
+    H5("h5", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+
+    /**
+     * 直播活动
+     */
+    LIVE("live", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+
+    /**
+     * 资讯
+     */
+    NEWS("news", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+
+    /**
+     * 在线选房
+     */
+    SALESBATCH("salesBatch", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
+
+    private String type;
+    private String scene;
+    private String page;
+
+    MiniAppPageEnum(String type, String scene, String page) {
+        this.type = type;
+        this.scene = scene;
+        this.page = page;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public String getPage() {
+        return page;
+    }
+
+    public static String getSceneByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getScene();
+            }
+        }
+        return null;
+    }
+
+    public static String getPageByType(String type) {
+        for (MiniAppPageEnum pageEnum : MiniAppPageEnum.values()) {
+            if (type.equals(pageEnum.getType())) {
+                return pageEnum.getPage();
+            }
+        }
+        return null;
+    }
+}

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

@@ -26,7 +26,7 @@ public class StringUtils {
     }
 
     public static String ifNull(String src, String defaultVal) {
-        return null == src || "".equals(src) ? defaultVal : src;
+        return isEmpty(src) ? defaultVal : src;
     }
 
     public static String random(int length) {

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

@@ -0,0 +1,33 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 微信二维码生成工具类
+ *
+ * @author gusy
+ * @date 2020/5/21 15:40
+ */
+public class WxQrCodeUtils {
+
+    /**
+     * 生成scene和页面
+     *
+     * @param type
+     * @param scene  为空则使用配置的通用模板
+     * @param params scene为空是必须按照模板内容填写
+     * @return
+     */
+    public static String generateSceneAndPage(String type, String scene, String... params) {
+        if (StringUtils.isBlank(scene)) {
+            String sceneTemplate = MiniAppPageEnum.getSceneByType(type);
+            scene = String.format(sceneTemplate, params);
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("scene", scene);
+        obj.put("page", MiniAppPageEnum.getPageByType(type));
+        return obj.toJSONString();
+    }
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.HelpActivityServiceImpl;
@@ -110,7 +111,7 @@ public class ExtendContentController extends BaseController {
                 taBuildingQueryWrapper.eq("building_id", e.getBuildingId());
                 TaBuilding taBuilding = iTaBuildingService.getOne(taBuildingQueryWrapper);
                 e.setCityName(null == tdCity ? "" : tdCity.getName());
-                if (taBuilding != null){
+                if (taBuilding != null && e.getIsHaveActive()){
                     e.setBuildingName(taBuilding.getBuildingName());
                 }
             });
@@ -172,7 +173,7 @@ public class ExtendContentController extends BaseController {
         //一个城市只能有一个开屏广告
         boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
         if (!existFlag){
-            responseBean.addError("该城市已有开屏广告，请勿再次上架");
+            responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
             return responseBean;
         }
 
@@ -251,7 +252,7 @@ public class ExtendContentController extends BaseController {
             //一个城市只能有一个开屏广告
             boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
             if (!existFlag){
-                responseBean.addError("该城市已有开屏广告，请勿再次上架");
+                responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
                 return responseBean;
             }
 

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

@@ -17,6 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -457,8 +458,12 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "helpActivityId", paramType = "path", value = "活动状态")
     })
     @RequestMapping(value = "/wx/helpActivity/{helpActivityId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "help")
     public ResponseBean wxHelpActivityGet(@PathVariable(value = "helpActivityId") Integer helpActivityId,
-                                          @RequestParam(value = "initiateId",required = false) Integer initiateId,HttpServletRequest request) {
+                                          @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                          @RequestParam(value = "channelId", required = false) String channelId,
+                                          @RequestParam(value = "sceneId", required = false) String sceneId,
+                                          HttpServletRequest request, @RequestParam(value = "initiateId",required = false) Integer initiateId) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

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

@@ -1,19 +1,28 @@
 package com.huiju.estateagents.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 微信首页
  */
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/api/wx")
 public class IndexController {
 
 
 
-
-
-
+    @PostMapping("/indexCustomer")
+    @ReportCustomer(type = "index")
+    public ResponseBean getPreloadData(@RequestParam(value = "id", required = false) String id,
+                                       @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                       @RequestParam(value = "channelId", required = false) String channelId,
+                                       @RequestParam(value = "sceneId", required = false) String sceneId,
+                                       HttpServletRequest request) {
+        return ResponseBean.success("success");
+    }
 
 }

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

@@ -12,6 +12,7 @@ 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.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
@@ -22,7 +23,6 @@ import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -194,10 +194,10 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-        if (StringUtils.isBlank(code)) {
+        if (StringUtils.isEmpty(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        if (StringUtils.isBlank(appid)) {
+        if (StringUtils.isEmpty(appid)) {
             return ResponseBean.error("Header 参数 appid 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -254,8 +254,8 @@ public class MiniAppController extends BaseController {
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            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)) {
+////                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !StringUtils.isEmpty(recommender)) {
 //                    // 校验是否点击过此人的分享
 //                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
 //                    if (checkPoint) {
@@ -265,7 +265,7 @@ public class MiniAppController extends BaseController {
 //                }
 //            });
 
-            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
+            if (!StringUtils.isEmpty(from) && !StringUtils.isEmpty(recommender) && !StringUtils.isEmpty(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -509,12 +509,18 @@ public class MiniAppController extends BaseController {
         String targetId = params.getString("targetId");
         // 目标名称
         String targetName = params.getString("targetName");
-        // 推广用户
+        // 推广用户 - 分享人
         String promoter = params.getString("promoter");
+        // 置业顾问
+        String consultantPersonId = request.getHeader("x-consultant");
+        // 渠道ID
+        String channelId = params.getString("channelId");
+        // 推广码ID
+        String qrCodeId = params.getString("qrCodeId");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
-        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+        if (null == phoneNoInfo || StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
             ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
         }
 
@@ -522,21 +528,32 @@ public class MiniAppController extends BaseController {
         Integer orgId = getOrgId(request);
         String phone = phoneNoInfo.getPhoneNumber();
 
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        customerFrom.setTargetName(targetName);
+        customerFrom.setOrgId(orgId);
+        customerFrom.setSceneId(sceneId);
+        if (!StringUtils.isEmpty(channelId)) {
+            customerFrom.setChannelId(Integer.valueOf(channelId));
+        }
+        if (!StringUtils.isEmpty(qrCodeId)) {
+            customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
+        }
+
         try {
             taPersonService.authPhone(
                     orgId,
                     openid,
                     phone,
                     buildingId,
-                    sceneId,
-                    targetType,
-                    targetId,
-                    targetName,
-                    promoter);
+                    promoter,
+                    consultantPersonId,
+                    customerFrom);
 
             return ResponseBean.success(phoneNoInfo);
         } catch (Exception e) {
-//           e.printStackTrace();
+           e.printStackTrace();
             return ResponseBean.error("授权手机失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }

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

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaOrgMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -355,7 +356,12 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "building")
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);

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

@@ -19,6 +19,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -272,7 +273,11 @@ public class TaBuildingDynamicController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "dynamicId", paramType = "path",value = "活动ID")
     })
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    @ReportCustomer(type = "activity")
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
                                              HttpServletRequest request){
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

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

@@ -1,41 +1,34 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import io.swagger.annotations.ApiOperation;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.excel.ActivityStatistics.*;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.apache.http.HttpRequest;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
@@ -260,4 +253,170 @@ public class TaChannelController extends BaseController {
         ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
         return taPerson;
     }
+
+    /**
+     * 渠道引进客户统计
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionList")
+    public ResponseBean getChannelIntroductionList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                                     @RequestParam(value = "targetType", required = false)String targetType,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                     @RequestParam(value = "channelId") Integer channelId,
+                                                     @RequestParam(value = "sortField", required = false) String sortField,
+                                                     @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                     HttpServletRequest request) {
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder, getTaPersonBuildingListByUserId(request));
+    }
+
+    /**
+     * 渠道注册用户列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserList")
+    public ResponseBean getNewuserList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                       @RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request) {
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 渠道访问次数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumList")
+    public ResponseBean getVisitNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                       @RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request) {
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+
+    /**
+     * 渠道访问人数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumList")
+    public ResponseBean getPersonNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                        @RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                         @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                        HttpServletRequest request) {
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 渠道引进客户统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionListExport")
+    public void getChannelIntroductionListExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                                         @RequestParam(value = "targetType", required = false)String targetType,
+                                                         @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                         @RequestParam(value = "channelId") Integer channelId,
+                                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=引进注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TsChannelDaily.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("引进注册用户").build();
+        List<TsChannelDaily> data = taChannelService.getChannelIntroductionListExport(getOrgId(request), startDate, endDate, targetType, buildingId, channelId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道注册用户列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserListExport")
+    public void getNewuserListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=注册用户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelAddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("注册用户").build();
+        List<ChannelAddRegistNum> data =  taChannelService.getNewuserListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 渠道访问次数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumListExport")
+    public void getVisitNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                      @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                        HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问次数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问次数").build();
+        List<ChannelVisitNum> data = taChannelService.getVisitNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+
+    /**
+     * 渠道访问人数列表导出
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumListExport")
+    public void getPersonNumListExport(@RequestParam(value = "targetId", required = false) String targetId,
+                                         @RequestParam(value = "targetType", required = false) String targetType,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                         HttpServletRequest request,HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=访问人数.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ChannelVisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("访问人数").build();
+        List<ChannelVisitPersonNum> data = taChannelService.getPersonNumListExport(getOrgId(request), channelId, targetId, targetType, buildingId,startDate,endDate);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -82,9 +83,34 @@ public class TaCustomImgController extends BaseController {
                 return responseBean;
             }
 
-            taCustomImg.setOrgId(getOrgId(request));
             taCustomImg.setStatus(CommConstant.STATUS_NORMAL);
-            if (iTaCustomImgService.save(taCustomImg)){
+            taCustomImg.setOrgId(getOrgId(request));
+
+            List<TaCustomImg> taCustomImgs = new ArrayList<>();
+            taCustomImgs.add(taCustomImg);
+            if (CommConstant.IMG_TYPE.equals(taCustomImg.getImgType())){
+                TaCustomImg customImg = new TaCustomImg();
+                customImg.setCreateTime(LocalDateTime.now());
+                customImg.setUpdateTime(LocalDateTime.now());
+                customImg.setOrgId(getOrgId(request));
+                customImg.setStatus(CommConstant.STATUS_NORMAL);
+                customImg.setImgUrl("https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg");
+                customImg.setImgType(CommConstant.BANNER_INDEX);
+                customImg.setImgDesc("小程序首页分享配图");
+                taCustomImgs.add(customImg);
+            }
+            if (CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType())){
+                TaCustomImg customImg = new TaCustomImg();
+                customImg.setCreateTime(LocalDateTime.now());
+                customImg.setUpdateTime(LocalDateTime.now());
+                customImg.setOrgId(getOrgId(request));
+                customImg.setStatus(CommConstant.STATUS_NORMAL);
+                customImg.setImgUrl("http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png");
+                customImg.setImgType(CommConstant.INDEX_NEWS);
+                customImg.setImgDesc("首页资讯logo");
+                taCustomImgs.add(customImg);
+            }
+            if (iTaCustomImgService.saveBatch(taCustomImgs)){
                 responseBean.addSuccess(taCustomImg);
             }else {
                 responseBean.addError("fail");

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -244,9 +245,14 @@ public class TaHousingResourcesController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
+    @ReportCustomer(type = "house")
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
-                                             HttpServletRequest request) {
+                                             @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
+                                             @RequestParam(value = "sceneId", required = false) String sceneId,
+                                             HttpServletRequest request,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source
+                                             ) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.ITaLiveActivityService;
 import org.slf4j.Logger;
@@ -51,18 +52,23 @@ public class TaLiveActivityController extends BaseController {
      * @param buildingId        所属楼盘
      * @param liveDetailType    详情类型 0是模板，1是自定义
      * @param status            状态
+     * @param source            查询来源，1:直播等活动，2:开屏广告
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                           String liveActivityTitle,
+                                           String cityId,
+                                           String buildingId,
+                                           Integer status,
+                                           @RequestParam(value = "source", defaultValue = "1") Integer source,
                                            HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request), source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -160,8 +166,8 @@ public class TaLiveActivityController extends BaseController {
                 iExtendContentService.updateBatchById(list);
             }
 
-            if(!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())){
-                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html",""));
+            if (!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())) {
+                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
             }
 
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
@@ -221,7 +227,12 @@ public class TaLiveActivityController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taLiveActivity/{id}", method = RequestMethod.GET)
-    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id, HttpServletRequest request) {
+    @ReportCustomer(type = "live")
+    public ResponseBean getLiveActivityDetailById(@PathVariable("id") String id,
+                                                  @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                                  @RequestParam(value = "channelId", required = false) String channelId,
+                                                  @RequestParam(value = "sceneId", required = false) String sceneId,
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaLiveActivityService.getLiveActivityDetailById(id, getOrgId(request));
@@ -248,14 +259,18 @@ public class TaLiveActivityController extends BaseController {
     @RequestMapping(value = "/wx/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityListForMiniApp(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                     String liveActivityTitle, String cityId, String buildingId, Integer status,
+                                                     String liveActivityTitle,
+                                                     String cityId,
+                                                     String buildingId,
+                                                     Integer status,
+                                                     @RequestParam(value = "source", defaultValue = "1") Integer source,
                                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null, source);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -215,7 +216,12 @@ public class TaNewsController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/wx/taNews/{id}",method= RequestMethod.GET)
-    public ResponseBean wxTaNewsGet(@PathVariable Integer id,HttpServletRequest request){
+    @ReportCustomer(type = "news")
+    public ResponseBean wxTaNewsGet(@PathVariable Integer id,
+                                    @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                    @RequestParam(value = "channelId", required = false) String channelId,
+                                    @RequestParam(value = "sceneId", required = false) String sceneId,
+                                    HttpServletRequest request){
         String openid = getOpenId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {

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

@@ -783,4 +783,16 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/userInfo/updatePhoto")
+    public ResponseBean updateUserPhoto(@RequestBody Map<String, String> photoUrl, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+
+        String openId = getOpenId(request);
+        String imgUrl = photoUrl.get("photoUrl");
+        if (StringUtils.isEmpty(imgUrl)){
+            responseBean.addError("请上传图片");
+            return responseBean;
+        }
+        return taPersonService.updateUserPhoto(imgUrl, openId);
+    }
 }

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

@@ -0,0 +1,244 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 二维码管理表 前端控制器
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@RestController
+@RequestMapping("/api")
+public class TaQrcodeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaQrcodeController.class);
+
+    @Autowired
+    public ITaQrcodeService iTaQrcodeService;
+
+    /**
+     * 分页查询列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/admin/listQrCode", method = RequestMethod.GET)
+    public ResponseBean listQrCodeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String targetType, String targetName, Integer channelId, String buildingId,
+                                              HttpServletRequest request) {
+        logger.info("接收参数：targetType：{}，targetName：{}，channelId：{}，buildingId：{}",
+                targetType, targetName, channelId, buildingId);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaPersonBuilding> personBuildingList = getTaPersonBuildingListByUserId(request);
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getUserId(request), getOrgId(request), personBuildingList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeList -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     *
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taQrcode", method = RequestMethod.POST)
+    public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 校验参数
+            if (StringUtils.isBlank(taQrcode.getTargetId()) || StringUtils.isBlank(taQrcode.getTargetType())) {
+                responseBean.addError("参数错误");
+                return responseBean;
+            }
+            responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("saveQrcode -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     *
+     * @param id 实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taQrcodeDelete(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.removeById(id)) {
+                responseBean.addSuccess("success");
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 批量删除
+     */
+    @ResponseBody
+    @RequestMapping(value = "/admin/qrCode/batchDelete", method = RequestMethod.DELETE)
+    public ResponseBean batchDelete(@RequestBody List<TaQrcode> taQrcodeList) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+
+            taQrcodeList.stream().forEach((record) -> {
+                record.setStatus(CommConstant.STATUS_DELETE);
+            });
+
+            responseBean.addSuccess(iTaQrcodeService.updateBatchById(taQrcodeList));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 修改对象
+     *
+     * @param id       实体ID
+     * @param taQrcode 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.PUT)
+    public ResponseBean taQrcodeUpdate(@PathVariable Integer id,
+                                       @RequestBody TaQrcode taQrcode) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaQrcodeService.updateById(taQrcode)) {
+                responseBean.addSuccess(taQrcode);
+            } else {
+                responseBean.addError("fail");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/taQrcode/{id}", method = RequestMethod.GET)
+    public ResponseBean taQrcodeGet(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaQrcodeService.getById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taQrcodeDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计信息
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/qrCode/getStatisticData", method = RequestMethod.GET)
+    public ResponseBean getStatisticData(Integer qrCodeId, HttpServletRequest request) {
+        logger.info("getStatisticData 接收参数：qrCodeId：{}", qrCodeId);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticData(qrCodeId, getOrgId(request));
+            logger.info("getStatisticData 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("getStatisticData 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计信息记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param qrCodeId
+     * @param type     1：访问人数，2：访问次数，3：新增注册用户数
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecord", method = RequestMethod.GET)
+    public ResponseBean getStatisticRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           Integer qrCodeId, Integer type, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticRecord(type, pageNum, pageSize, qrCodeId, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getStatisticRecord 异常：", e);
+            responseBean.addError("fail");
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/qrCode/getStatisticRecordExport", method = RequestMethod.GET)
+    public void getStatisticRecordExport(@RequestParam(value = "qrCodeId") Integer qrCodeId,
+                                         @RequestParam(value = "type") Integer type, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        try {
+            iTaQrcodeService.getStatisticRecordExport(type, qrCodeId, getOrgId(request), response);
+        } catch (Exception e) {
+            logger.error("getStatisticRecordExport 异常：", e);
+            response.reset();
+            response.setContentType("application/json");
+            response.setCharacterEncoding("utf-8");
+            Map<String, Object> map = new HashMap();
+            map.put("code", ResponseBean.ERROR_UNAVAILABLE);
+            map.put("message", "下载文件失败" + e.getMessage());
+            response.getWriter().println(JSON.toJSONString(map));
+        }
+    }
+
+}
+
+

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

@@ -7,23 +7,20 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
-import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.ITaRaiseService;
+import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.ITdCityService;
 import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

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

@@ -848,6 +848,8 @@ public class TaRecommendCustomerController extends BaseController {
                                       @RequestParam(value = "customerType") String customerType,
                                       @RequestParam(value = "status", required = false) Integer status,
                                       @RequestParam(value = "sceneType", required = false) String sceneType,
+                                      @RequestParam(value = "startCreateDate", required = false) String startCreateDate,
+                                      @RequestParam(value = "endCreateDate", required = false) String endCreateDate,
                                       @RequestParam(value = "belongStatus", required = false) Integer belongStatus) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
@@ -876,7 +878,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request), belongStatus);
+            List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, getTaPersonBuildingListByUserId(request),
+                    belongStatus, startCreateDate, endCreateDate);
             excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
@@ -898,7 +902,9 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, getTaPersonBuildingListByUserId(request));
+            List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode * pageSize, pageSize,
+                    buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, sceneType, startCreateDate,
+                    endCreateDate, getTaPersonBuildingListByUserId(request));
             excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;
@@ -978,35 +984,37 @@ public class TaRecommendCustomerController extends BaseController {
 
     /**
      * 校验此职业顾问下有没有私客存在
+     *
      * @return
      */
     @GetMapping("/admin/consultant/customer/list")
     public ResponseBean consultantCustomerList(@RequestParam(value = "userId") Integer userId,
                                                @RequestParam(value = "personId") String personId,
                                                @RequestParam(value = "buildingId") String buildingId,
-                                               HttpServletRequest request){
+                                               HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        try{
-            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId,personId,buildingId,orgId,getTaPersonBuildingListByUserId(request));
+        try {
+            List<TaRecommendCustomer> list = taRecommendCustomerService.getConsultantCustomerList(userId, personId, buildingId, orgId, getTaPersonBuildingListByUserId(request));
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 迁移私客到新的置业顾问
+     *
      * @return
      */
     @PutMapping("/admin/consultant/customer/move")
-    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list,HttpServletRequest request){
-        try{
+    public ResponseBean moveConsultantCustomer(@RequestBody List<TaRecommendCustomer> list, HttpServletRequest request) {
+        try {
             taRecommendCustomerService.updateBatchById(list);
             return ResponseBean.success(list);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 }

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaShareActivityService;
@@ -360,8 +361,13 @@ public class TaShareActivityController extends BaseController {
      * @param groupActivityId  实体ID
      */
     @RequestMapping(value="/wx/taShareActivity/{groupActivityId}",method= RequestMethod.GET)
+    @ReportCustomer(type = "group")
     public ResponseBean wxShareActivityGet(@PathVariable Integer groupActivityId,
-                                           @RequestParam(value = "recordId",required = false) Integer recordId, HttpServletRequest request){
+                                           @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                           @RequestParam(value = "channelId", required = false) String channelId,
+                                           @RequestParam(value = "sceneId", required = false) String sceneId,
+                                           HttpServletRequest request,
+                                           @RequestParam(value = "recordId",required = false) Integer recordId ){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -15,6 +15,7 @@ import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.reportCustomerAop.ReportCustomer;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -33,8 +34,8 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
-    * 引流项目  前端控制器
-    * </p>
+ * 引流项目  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-10-18
@@ -47,7 +48,7 @@ public class TaDrainageController extends BaseController {
 
     @Autowired
     public ITaDrainageService iTaDrainageService;
-    
+
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
@@ -65,55 +66,68 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
+     * @param drainageId
+     * @param name
+     * @param isMiniapp
+     * @param status
+     * @param buildingId
+     * @param source     查询来源,1:H5等活动，2:开屏广告
+     * @param request
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
-    public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                       @RequestParam(value ="drainageId",required = false) Integer drainageId,
-                                       @RequestParam(value ="name",required = false) String name,
-                                       @RequestParam(value ="isMiniapp",required = false) Integer isMiniapp,
-                                       @RequestParam(value ="status",required = false) Integer status,
-                                       @RequestParam(value ="buildingId",required = false) String buildingId,
-                                       HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage", method = RequestMethod.GET)
+    public ResponseBean taDrainageList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "drainageId", required = false) Integer drainageId,
+                                       @RequestParam(value = "name", required = false) String name,
+                                       @RequestParam(value = "isMiniapp", required = false) Integer isMiniapp,
+                                       @RequestParam(value = "status", required = false) Integer status,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "source", defaultValue = "1") Integer source,
+                                       HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
             //使用分页插件
-		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
+            IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq(null != isMiniapp,"is_miniapp",isMiniapp);
-            if (null == status){
-                queryWrapper.gt("status",-1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq(null != isMiniapp, "is_miniapp", isMiniapp);
+            if (null == status) {
+                queryWrapper.gt("status", -1);
+            }
+            queryWrapper.eq(null != status, "status", status);
+            if(2 == source){
+                queryWrapper.isNull(StringUtils.isEmpty(buildingId), "building_id");
+            }else{
+                queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
             }
-            queryWrapper.eq(null != status,"status",status);
-            queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
-            queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
-            queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
+            queryWrapper.eq(null != drainageId, "drainage_id", drainageId);
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id", taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user", getUserId(request)));
+            queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
             List<TaDrainage> records = result.getRecords();
             records.forEach(e -> {
                 QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-                taThirdPartyMiniappConfigQueryWrapper.eq("target_id",e.getDrainageId());
-                taThirdPartyMiniappConfigQueryWrapper.eq("org_id",getOrgId(request));
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+                taThirdPartyMiniappConfigQueryWrapper.eq("target_id", e.getDrainageId());
+                taThirdPartyMiniappConfigQueryWrapper.eq("org_id", getOrgId(request));
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
-                if (null != taThirdPartyMiniappConfig){
+                if (null != taThirdPartyMiniappConfig) {
                     e.setAppid(taThirdPartyMiniappConfig.getAppid());
                     e.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
                 }
             });
             result.setRecords(records);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageList -=- {}",e.toString());
+            logger.error("taDrainageList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -121,27 +135,28 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/add",method= RequestMethod.POST)
-    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/add", method = RequestMethod.POST)
+    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setOrgId(getOrgId(request));
             taDrainage.setCreateDate(LocalDateTime.now());
             taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
-            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
+            if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())) {
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             taDrainage.setCreateUser(getUserId(request));
-            if (iTaDrainageService.save(taDrainage)){
+            if (iTaDrainageService.save(taDrainage)) {
                 // 根据ORGID查询当前小程序表的miniapp_id
-                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
-                taMiniappQuery.eq("org_id",getOrgId(request));
+                QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+                taMiniappQuery.eq("org_id", getOrgId(request));
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
                 // 生成二维码
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0", taDrainage.getDrainageId().toString()).replace("#1", "h5"), taMiniapp.getMiniappId());
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
                 iTaDrainageService.updateById(taDrainage);
 
@@ -155,33 +170,35 @@ public class TaDrainageController extends BaseController {
                 taThirdPartyMiniappConfig.setTargetId(taDrainage.getDrainageId().toString());
                 iTaThirdPartyMiniappConfigService.save(taThirdPartyMiniappConfig);
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageAdd -=- {}",e.toString());
+            logger.error("taDrainageAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
-    
+
     /**
      * 获取uuid
+     *
      * @return
      */
     private String getUUIDS() {
-        String uuid= UUID.randomUUID().toString().replace("-", "");
+        String uuid = UUID.randomUUID().toString().replace("-", "");
         return uuid;
     }
-    
+
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -193,24 +210,24 @@ public class TaDrainageController extends BaseController {
             }
 
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",drainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",drainage.getDrainageId());
+            queryWrapper.eq("org_id", drainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", drainage.getDrainageId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0){
+            if (null != drainage.getStatus() && drainage.getStatus().equals(CommConstant.STATUS_NORMAL) && list.size() > 0) {
                 responseBean.addError("删除项目会删除全部数据，不建议删除数据。可以点击下架按钮终止活动。");
                 return responseBean;
             }
 
             drainage.setStatus(-1);
-            if(iTaDrainageService.updateById(drainage)){
+            if (iTaDrainageService.updateById(drainage)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -218,30 +235,31 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.PUT)
     public ResponseBean taDrainageUpdate(@PathVariable Integer id,
-                                        @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
-            if (!taDrainage.getIsMiniapp()){
+            if (!taDrainage.getIsMiniapp()) {
                 taDrainage.setShareImg("");
                 taDrainage.setH5Address("");
                 taDrainage.setShareTitle("");
                 taDrainage.setMiddleImg("");
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -249,26 +267,27 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean taDrainageGet(@PathVariable Integer id,HttpServletRequest request){
+    @RequestMapping(value = "/admin/taDrainage/{id}", method = RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaDrainage taDrainage = iTaDrainageService.getById(id);
             QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("target_type",CommConstant.TARGET_TYPE_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
-            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("target_type", CommConstant.TARGET_TYPE_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", getOrgId(request));
             TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
-            if (null != taThirdPartyMiniappConfig){
+            if (null != taThirdPartyMiniappConfig) {
                 taDrainage.setAppid(taThirdPartyMiniappConfig.getAppid());
                 taDrainage.setAppSecret(taThirdPartyMiniappConfig.getAppSecret());
             }
             responseBean.addSuccess(taDrainage);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -276,32 +295,33 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 更改上架下架状态
-     * @param id  实体ID
+     *
+     * @param id         实体ID
      * @param taDrainage 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taDrainage/exchange/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taDrainage/exchange/{id}", method = RequestMethod.PUT)
     public ResponseBean exchangeDrainage(@PathVariable Integer id,
-                                         @RequestBody TaDrainage taDrainage){
+                                         @RequestBody TaDrainage taDrainage) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taDrainage.setDrainageId(id);
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",taDrainage.getOrgId());
-            queryWrapper.eq("content_type",CommConstant.EVENT_H5);
-            queryWrapper.eq("target_id",taDrainage.getDrainageId());
+            queryWrapper.eq("org_id", taDrainage.getOrgId());
+            queryWrapper.eq("content_type", CommConstant.EVENT_H5);
+            queryWrapper.eq("target_id", taDrainage.getDrainageId());
 
             queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
 
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
+            if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)) {
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);
                 //如果H5有被轮播图或开屏广告选中则轮播图和开屏广告都要下架
                 list.forEach(e -> {
                     e.setStatus(CommConstant.STATUS_UNACCALIMED);
                 });
-            }else{
-                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())){
+            } else {
+                if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isBefore(LocalDateTime.now())) {
                     responseBean.addError("已过下架时间，无法上架");
                     return responseBean;
                 }
@@ -311,17 +331,17 @@ public class TaDrainageController extends BaseController {
                     e.setStatus(CommConstant.STATUS_NORMAL);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
-            if (iTaDrainageService.updateById(taDrainage)){
+            if (iTaDrainageService.updateById(taDrainage)) {
                 responseBean.addSuccess(taDrainage);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageUpdate -=- {}",e.toString());
+            logger.error("taDrainageUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -329,16 +349,22 @@ public class TaDrainageController extends BaseController {
 
     /**
      * 微信端获取数据
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/wx/taDrainage/{id}",method= RequestMethod.GET)
-    public ResponseBean wxDrainageGet(@PathVariable Integer id){
+    @RequestMapping(value = "/wx/taDrainage/{id}", method = RequestMethod.GET)
+    @ReportCustomer(type = "h5")
+    public ResponseBean wxDrainageGet(@PathVariable Integer id,
+                                      @RequestParam(value = "qrCodeId", required = false) String qrCodeId,
+                                      @RequestParam(value = "channelId", required = false) String channelId,
+                                      @RequestParam(value = "sceneId", required = false) String sceneId,
+                                      HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaDrainageService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taDrainageDelete -=- {}",e.toString());
+            logger.error("taDrainageDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -104,6 +104,8 @@ public class ExtendContent implements Serializable {
      */
     private Integer createUser;
 
+    private Boolean isHaveActive;
+
     /**
      * 排序
      */

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

@@ -351,4 +351,7 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaSalesBatch> salesBatch;
+
+    @TableField(exist = false)
+    private List<ExtendContent> extendContent;
 }

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

@@ -1,15 +1,16 @@
 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  
@@ -70,6 +71,9 @@ public class TaChannel implements Serializable {
     @TableField(exist = false)
     private Integer inviteCount;
 
+    @TableField(exist = false)
+    private Integer customerNum;
+
     /**
      * 创建时间
      */

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -18,7 +19,6 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 public class TaCustomerFrom implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -109,5 +109,43 @@ public class TaCustomerFrom implements Serializable {
      */
     private String remark;
 
+    /**
+     * 用户名
+     */
+    @TableField(exist = false)
+    private String userName;
+
+    /**
+     * 用户手机号码
+     */
+    @TableField(exist = false)
+    private String userTel;
+
+    /**
+     * 用户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 归属城市
+     */
+    @TableField(exist = false)
+    private String city;
+
+    /**
+     * 用户注册时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime registerTime;
 
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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

@@ -55,4 +55,6 @@ public class TaMiniappQrcode implements Serializable {
      */
     private String qrCode;
 
+    private Integer targetId;
+
 }

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

@@ -330,4 +330,14 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String targetName;
+
+    /**
+     * 渠道 ID
+     */
+    private Integer channelId;
+
+    /**
+     * 推广码ID
+     */
+    private Integer qrCodeId;
 }

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

@@ -202,4 +202,20 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String customerId;
+
+    /**
+     * 客户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 客户归属地
+     */
+    @TableField(exist = false)
+    private String city;
+
+    private Integer qrCodeId;
+
+    private Integer channelId;
 }

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

@@ -0,0 +1,99 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaQrcode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * qr_code_id id
+     */
+    @TableId(value = "qr_code_id", type = IdType.AUTO)
+    private Integer qrCodeId;
+
+    /**
+     * org_id
+     */
+    private Integer orgId;
+
+    /**
+     * building_id 关联项目ID
+     */
+    private String buildingId;
+
+    /**
+     * channel_id 渠道ID
+     */
+    private Integer channelId;
+
+    /**
+     * target_type 二维码类型
+     */
+    private String targetType;
+
+    /**
+     * target_name 二维码内容
+     */
+    private String targetName;
+
+    /**
+     * target_id
+     */
+    private String targetId;
+
+    /**
+     * qr_code_url 二维码地址
+     */
+    private String qrCodeUrl;
+
+    /**
+     * status 状态
+     */
+    private Integer status;
+
+    /**
+     * create_date 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * create_user 创建人
+     */
+    private Integer createUser;
+
+    @TableField(exist = false)
+    private List<TaQrcode> qrcodeList;
+
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
+}

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

@@ -1,12 +1,14 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 活动统计 
@@ -93,5 +95,14 @@ public class TsActivityDaily implements Serializable {
      */
     private Integer newCustomers;
 
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
 
+    /**
+     * 统计类型
+     */
+    @TableField(exist = false)
+    private String statisticType;
 }

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelAddRegistNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelAddRegistNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "注册时间", index = 4)
+    private String createDate;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitNum.java

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @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 = 4)
+    private String visitDate;
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitPersonNum.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+//    /**
+//     * 来源渠道
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "来源渠道", index = 4)
+//    private String personFrom;
+//
+//    /**
+//     * 置业顾问
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问", index = 5)
+//    private String realtyConsultant;
+//
+//    /**
+//     * 置业顾问电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "置业顾问电话", index = 6)
+//    private String realtyConsultantPhone;
+//
+//    /**
+//     * 推广人
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "推广人", index = 7)
+//    private String sharePersonName;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/TsChannelDaily.java

@@ -0,0 +1,58 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TsChannelDaily {
+    /**
+     * 类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "类型", index = 0)
+    private String targetType;
+
+    /**
+     * 内容
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "内容", index = 1)
+    private String targetName;
+
+    /**
+     * 关联项目
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "关联项目", index = 2)
+    private String buildingName;
+
+    /**
+     * 新增注册用户
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增注册用户", index = 3)
+    private Integer newCustomers;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersons;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+    /**
+     * 活动ID
+     */
+    @ExcelIgnore
+    private String targetId;
+
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeNewPersonNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class QrCodeNewPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "注册时间", index = 4)
+    private String registerTime;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class QrCodeVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private String visitTime;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitPersonNum.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class QrCodeVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -17,6 +17,7 @@ import com.huiju.estateagents.service.ISysButtonInMenuService;
 import com.huiju.estateagents.service.ITaRoleButtonService;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.jsonwebtoken.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -27,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Component
 public class AccessInterceptor implements HandlerInterceptor {
     
@@ -95,6 +97,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+        log.info("接口请求路径是{}",request.getRequestURI());
         //第三方权限校验
         String tokenHeader = request.getHeader("x-token");
         if (!StringUtils.isEmpty(tokenHeader)){

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

@@ -3,9 +3,16 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -39,4 +46,30 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
     IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+
+    /**
+     * 渠道引进客户统计
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg, @Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("channelType") String channelType, @Param("buildingId") String buildingId, @Param("channelId") Integer channelId, @Param("sortField") String sortField, @Param("orderType") String orderType, @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitNum> getChannelVisitNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
+
+    List<ChannelVisitPersonNum> getChannelPersonNumListExport(@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

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

@@ -30,7 +30,15 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg,
+                                                    @Param("liveActivityTitle") String liveActivityTitle,
+                                                    @Param("cityId") String cityId,
+                                                    @Param("buildingId") String buildingId,
+                                                    @Param("status") Integer status,
+                                                    @Param("orgId") Integer orgId,
+                                                    @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                    @Param("userId") Integer userId,
+                                                    @Param("source") Integer source);
     /**
      * 批量更新直播活动状态
      *

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @since 2019-09-11
  */
 @Mapper
+@Component
 public interface TaMiniappMapper extends BaseMapper<TaMiniapp> {
 
     List<TaMiniapp> getAllAvaliableMiniapps();

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

@@ -26,4 +26,5 @@ public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
     List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
 
     List<TaBuilding> getBuildingsOf(@Param("personOrUser") String personOrUser);
+
 }

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

@@ -0,0 +1,92 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表 Mapper 接口
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Mapper
+@Component
+public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
+
+    QrCodeStatisticResponseBO getStatisticData(@Param("orgId") Integer orgId);
+
+    IPage<TaQrcode> listQrCodeByCondition(IPage<TaQrcode> page,
+                                          @Param("targetType") String targetType,
+                                          @Param("targetName") String targetName,
+                                          @Param("channelId") Integer channelId,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("userId") Integer userId,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取访问用户人数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitPersons(@Param("qrCodeId") Integer qrCodeId,
+                            @Param("orgId") Integer orgId);
+
+    /**
+     * 获取访问次数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitNum(@Param("qrCodeId") Integer qrCodeId,
+                        @Param("orgId") Integer orgId);
+
+    /**
+     * 获取新增用户数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getNewPersons(@Param("qrCodeId") Integer qrCodeId,
+                          @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                     @Param("qrCodeId") Integer qrCodeId,
+                                                     @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitNumRecord(IPage<TaPersonVisitRecord> page,
+                                                 @Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getNewPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                   @Param("qrCodeId") Integer qrCodeId,
+                                                   @Param("orgId") Integer orgId);
+
+    List<QrCodeVisitPersonNum> getVisitPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                           @Param("orgId") Integer orgId);
+
+
+    List<QrCodeVisitNum> getVisitNumRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    List<QrCodeNewPersonNum> getNewPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                       @Param("orgId") Integer orgId);
+}

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,19 +28,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     Integer getMyCutsomerNum(@Param("personId") String personId);
 
-    String getCustomerPersonId(@Param("customerId")String customerId);
+    String getCustomerPersonId(@Param("customerId") String customerId);
 
-    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId,@Param("personId")String personId);
+    TaRecommendCustomer getCustomerDetail(@Param("customerId") String customerId, @Param("personId") String personId);
 
-    TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
+    TaRecommendCustomer getCustomerById(@Param("customerId") String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
-    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
+
+    IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page, @Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客
+     *
      * @param page
      * @param name
      * @param tel
@@ -67,34 +72,39 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取推荐用户数据
+     *
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex,@Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据
+     *
      * @param orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取经纪人数据 总数
+     *
      * @param orgId
      * @return
      */
@@ -102,15 +112,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 导出数据 获取经纪人数据
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name")String name, @Param("tel")String tel, @Param("channelId")String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 公客总数
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -120,10 +132,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    Integer getPublicCustomerExportListCount(@Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel);
 
     /**
      * 导出数据 公客
+     *
      * @param name
      * @param tel
      * @param entryType
@@ -135,20 +148,23 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode,
                                                            @Param("pageSize") Integer pageSize,
-                                                           @Param("buildingId")String buildingId,
+                                                           @Param("buildingId") String buildingId,
                                                            @Param("name") String name,
                                                            @Param("tel") String tel,
                                                            @Param("entryType") String entryType,
                                                            @Param("verifyStatus") String verifyStatus,
                                                            @Param("sex") Integer sex,
                                                            @Param("orgId") Integer orgId,
-                                                           @Param("consultTel")String consultTel,
-                                                           @Param("sceneType")String sceneType,
+                                                           @Param("consultTel") String consultTel,
+                                                           @Param("sceneType") String sceneType,
                                                            @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
-                                                           @Param("belongStatus") Integer belongStatus);
+                                                           @Param("belongStatus") Integer belongStatus,
+                                                           @Param("startCreateDate") String startCreateDate,
+                                                           @Param("endCreateDate") String endCreateDate);
 
     /**
      * 导出数据 私客总数
+     *
      * @param buildingId
      * @param name
      * @param tel
@@ -161,10 +177,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status") Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客
+     *
      * @param pageCode
      * @param pageSize
      * @param buildingId
@@ -179,18 +196,35 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode,
+                                                      @Param("pageSize") Integer pageSize,
+                                                      @Param("building") String buildingId,
+                                                      @Param("name") String name,
+                                                      @Param("tel") String tel,
+                                                      @Param("consultName") String consultName,
+                                                      @Param("consultTel") String consultTel,
+                                                      @Param("entryType") String entryType,
+                                                      @Param("verifyStatus") String verifyStatus,
+                                                      @Param("sex") Integer sex,
+                                                      @Param("orgId") Integer orgId,
+                                                      @Param("status") Integer status,
+                                                      @Param("sceneType") String sceneType,
+                                                      @Param("startCreateDate") String startCreateDate,
+                                                      @Param("endCreateDate") String endCreateDate,
+                                                      @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
     /**
      * 获取我的客户的人数统计
+     *
      * @param personId
      * @param userId
      * @return
      */
-	Map<String, Object> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
-    
+    Map<String, Object> getMyCustStatistics(@Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
+
     /**
      * 获取我的跟进客户数据
+     *
      * @param page
      * @param personId
      * @param userId
@@ -205,19 +239,30 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param endArrivalDate
      * @return
      */
-    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status,@Param("startReportDate") String startReportDate,@Param("endReportDate") String endReportDate,@Param("startArrivalDate") String startArrivalDate,@Param("endArrivalDate") String endArrivalDate);
-    
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status, @Param("startReportDate") String startReportDate, @Param("endReportDate") String endReportDate, @Param("startArrivalDate") String startArrivalDate, @Param("endArrivalDate") String endArrivalDate);
+
     /**
      * 获取我的客户详情数据
+     *
      * @param customerId
      * @return
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
-    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PersonIntention> getCustomerIntentions(@Param("personId") String personId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaRecommendCustomer> getCustomersIRecommended(IPage<TaRecommendCustomer> page, @Param("customerId") String customerId, @Param("status") Integer status, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
+    /**
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @param personId
+     * @return
+     */
     IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page,
                                                            @Param("orgId") Integer orgId,
                                                            @Param("userId") String userId,
@@ -230,6 +275,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * 查询 person 对应 楼盘 的客户
      * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
      * 如果没有无小程序级别客户, 则返回最早的一条
+     *
      * @param orgId
      * @param personId
      * @param buildingId
@@ -239,12 +285,22 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     /**
      * 获取置业福问下的客户
+     *
      * @param userId
      * @param personId
      * @param buildingId
      * @param orgId
      * @return
      */
-    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId, @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 
+    /**
+     * 校验客户存在记录
+     * @param orgId
+     * @param personId
+     * @param consultBuildingIds
+     * @param buildingId
+     * @return
+     */
+    Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomer.java

@@ -0,0 +1,15 @@
+package com.huiju.estateagents.reportCustomerAop;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+public @interface ReportCustomer {
+    String type() default "" ;
+}

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerAspect.java

@@ -0,0 +1,171 @@
+package com.huiju.estateagents.reportCustomerAop;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Aspect
+@Component
+public class ReportCustomerAspect extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ReportCustomerAspect.class);
+
+    @Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    ReportCustomerImpl reportCustomerImpl;
+
+
+    /**
+     * 以自定义 @ReportCustomer 注解为切点
+     */
+    @Pointcut("@annotation(com.huiju.estateagents.reportCustomerAop.ReportCustomer)")
+    public void reportCustomer() {
+
+    }
+
+    @After("reportCustomer()")
+    public ResponseBean doAround(JoinPoint proceedingJoinPoint) {
+        logger.info("ReportCustomerAspect 开始");
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            ReportCustomer reportCustomer = ((MethodSignature) proceedingJoinPoint.getSignature()).getMethod().getAnnotation(ReportCustomer.class);
+            //获取请求参数
+            Object[] args = proceedingJoinPoint.getArgs();
+            String targetType = reportCustomer.type();
+            String targetId = String.valueOf(args[0]);
+            String qrCodeId = String.valueOf(args[1]);
+            String channelId = String.valueOf(args[2]);
+            String sceneId = String.valueOf(args[3]);
+            HttpServletRequest request = (HttpServletRequest) args[4];
+
+            Map<String, Object> stringObjectMap = getBuildingByIdAndType(targetId, targetType);
+            if (!CommConstant.INDEX.equals(targetType) && request == null) {
+                responseBean.addError("未授权，不进行操作");
+                return responseBean;
+            }
+
+            String consultantPersonId = request.getHeader("x-consultant");
+            String recommend = request.getHeader("x-recommender");
+
+            logger.info("ReportCustomerAspect 获取header信息，consultantPersonId：{}，recommend：{}", consultantPersonId, recommend);
+
+            List<TaPerson> persons = getPersonsByOpenId(getOpenId(request));
+            TaPerson taPerson = persons.get(0);
+            Integer orgId = getOrgId(request);
+
+            TaCustomerFrom taCustomerFrom = assembleVO(taPerson, targetType,StringUtils.ifNull(targetId,null), null == stringObjectMap ? null : stringObjectMap.get("targetName").toString(), orgId, StringUtils.ifNull(sceneId,null), channelId, qrCodeId);
+            // 推广人
+            TaPerson recPerson = StringUtils.isEmpty(recommend) ? null : taPersonMapper.getById(recommend);
+            // 是否置业顾问
+            boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+            TaPerson consultantInfo = null != consultantPersonId ? reportCustomerImpl.getPerson(consultantPersonId) : (isConsultant ? recPerson : null);
+            // 推荐楼盘
+            TaBuilding taBuilding = null == stringObjectMap ? null : (TaBuilding) stringObjectMap.get("taBuilding");
+            TaBuilding building = taBuilding == null ? null : taBuildingMapper.selectById(taBuilding.getBuildingId());
+
+            if (StringUtils.isEmpty(taPerson.getPhone())) {
+                responseBean.addError("未授权，不进行操作");
+                return responseBean;
+            }
+            iTaRecommendCustomerService.newCustomer(orgId, taPerson, recPerson, consultantInfo, building, taCustomerFrom);
+            responseBean.addSuccess("绑定成功");
+
+        } catch (Exception e) {
+            logger.error("绑定失败",e);
+            responseBean.addError("失败");
+        }
+        logger.info("ReportCustomerAspect 结束");
+        return responseBean;
+    }
+
+    public TaCustomerFrom assembleVO(TaPerson person, String targetType, String targetId, String targetName, Integer orgId, String sceneId, String channelId, String qrCodeId) {
+        // 客户来源
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setPersonId(person.getPersonId());
+        customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        customerFrom.setTargetName(targetName);
+        customerFrom.setOrgId(orgId);
+        customerFrom.setSceneId(sceneId);
+        if (!StringUtils.isEmpty(channelId)) {
+            customerFrom.setChannelId(Integer.valueOf(channelId));
+        }
+        if (!StringUtils.isEmpty(qrCodeId)) {
+            customerFrom.setQrCodeId(Integer.valueOf(qrCodeId));
+        }
+        customerFrom.setCreateDate(LocalDateTime.now());
+
+        return customerFrom;
+    }
+
+    public List<TaPerson> getPersonsByOpenId(String openId) {
+        return taPersonMapper.getPersonByOpenId(openId);
+    }
+
+    public Map<String, Object> getBuildingByIdAndType(String targetId, String targetType) {
+        Map<String, Object> buildingAndNameInfo = null;
+
+        switch (targetType) {
+            case CommConstant.FAVOR_ACTIVITY:
+                buildingAndNameInfo = reportCustomerImpl.selectActivityBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_HELP:
+                buildingAndNameInfo = reportCustomerImpl.selectHelpBuildingInfo(targetId);
+                break;
+            case CommConstant.POINTS_CHANGE_GROUP:
+                buildingAndNameInfo = reportCustomerImpl.selectGroupBuildingInfo(targetId);
+                break;
+            case CommConstant.LIVE:
+                buildingAndNameInfo = reportCustomerImpl.selectLiveBuildingInfo(targetId);
+                break;
+            case CommConstant.EVENT_H5:
+                buildingAndNameInfo = reportCustomerImpl.selectH5BuildingInfo(targetId);
+                break;
+            case CommConstant.FAVOR_NEWS:
+                buildingAndNameInfo = reportCustomerImpl.selectNewsBuildingInfo(targetId);
+                break;
+            case CommConstant.HOUSE:
+                buildingAndNameInfo = reportCustomerImpl.selectHouseBuildingInfo(targetId);
+                break;
+            case CommConstant.INDEX:
+                break;
+            default:
+                buildingAndNameInfo = reportCustomerImpl.selectBuildingInfo(targetId);
+                break;
+        }
+
+        return buildingAndNameInfo;
+    }
+
+
+}

src/main/java/com/huiju/estateagents/reportCustomerAop/ReportCustomerImpl.java

@@ -0,0 +1,169 @@
+package com.huiju.estateagents.reportCustomerAop;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class ReportCustomerImpl extends ServiceImpl<TaPersonMapper, TaPerson> {
+
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @Autowired
+    private HelpActivityMapper helpActivityMapper;
+
+    @Autowired
+    private TaShareActivityMapper taShareActivityMapper;
+
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
+
+    public Map<String, Object> selectActivityBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+        taBuildingDynamicQueryWrapper.eq("dynamic_id", targetId);
+        TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQueryWrapper);
+        map.put("targetName", taBuildingDynamic.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(taBuildingDynamic.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectHelpBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", targetId);
+        HelpActivity helpActivity = helpActivityMapper.selectOne(helpActivityQueryWrapper);
+        map.put("targetName", helpActivity.getTitle());
+
+        TaBuilding taBuilding = buildingInfo(helpActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectGroupBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("group_activity_id", targetId);
+        TaShareActivity taShareActivity = taShareActivityMapper.selectOne(taShareActivityQueryWrapper);
+        map.put("targetName", taShareActivity.getActivityName());
+
+        TaBuilding taBuilding = buildingInfo(taShareActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectLiveBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
+        taLiveActivityQueryWrapper.eq("live_activity_id", targetId);
+        TaLiveActivity taLiveActivity = taLiveActivityMapper.selectOne(taLiveActivityQueryWrapper);
+        map.put("targetName", taLiveActivity.getLiveActivityTitle());
+
+        TaBuilding taBuilding = buildingInfo(taLiveActivity.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectH5BuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaDrainage> taDrainageQueryWrapper = new QueryWrapper<>();
+        taDrainageQueryWrapper.eq("drainage_id", targetId);
+        TaDrainage taDrainage = taDrainageMapper.selectOne(taDrainageQueryWrapper);
+        map.put("targetName", taDrainage.getName());
+
+        TaBuilding taBuilding = buildingInfo(taDrainage.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public Map<String, Object> selectBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", targetId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        map.put("targetName", taBuilding.getBuildingName());
+        map.put("taBuilding", taBuilding);
+        return map;
+    }
+
+    public Map<String, Object> selectNewsBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
+        taNewsQueryWrapper.eq("news_id", targetId);
+        TaNews taNews = taNewsMapper.selectOne(taNewsQueryWrapper);
+        map.put("targetName", taNews.getNewsName());
+
+        TaBuilding taBuilding = buildingInfo(taNews.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public TaBuilding buildingInfo(String buildingId){
+        QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
+        taBuildingQueryWrapper.eq("building_id", buildingId);
+        TaBuilding taBuilding = taBuildingMapper.selectOne(taBuildingQueryWrapper);
+        return taBuilding;
+    }
+
+    public Map<String, Object> selectHouseBuildingInfo(String targetId){
+        Map<String, Object> map = new HashMap<>();
+
+        QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
+        taSalesBatchQueryWrapper.eq("sales_batch_id", targetId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectOne(taSalesBatchQueryWrapper);
+        map.put("targetName", taSalesBatch.getSalesBatchName());
+
+        TaBuilding taBuilding = buildingInfo(taSalesBatch.getBuildingId());
+        map.put("taBuilding", taBuilding);
+
+        return map;
+    }
+
+    public TaPerson getPerson(String personId){
+        return getById(personId);
+    }
+
+    public Map<String, Object> selectIndexInfo(String targetId) {
+        Map<String, Object> map = new HashMap<>();
+        return map;
+    }
+}

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

@@ -41,7 +41,8 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
+                                                      Integer userId,Integer source);
 
     /**
      * 访问量自增

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

@@ -4,6 +4,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
@@ -115,9 +116,9 @@ public interface ITaPersonService extends IService<TaPerson> {
                    String openid,
                    String phone,
                    String buildingId,
-                   String sceneId,
-                   String targetType,
-                   String targetId,
-                   String targetName,
-                   String promoter) throws Exception;
+                   String promoter,
+                   String consultantPersonId,
+                   TaCustomerFrom customerFrom) throws Exception;
+
+    ResponseBean updateUserPhoto(String photoUrl, String openId);
 }

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

@@ -0,0 +1,36 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表 服务类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+public interface ITaQrcodeService extends IService<TaQrcode> {
+
+    ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                       String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+
+    ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
+
+    ResponseBean getStatisticData(Integer qrCodeId, Integer orgId);
+
+    ResponseBean getStatisticRecord(Integer type, Integer pageNum, Integer pageSize, Integer qrCodeId, Integer orgId);
+
+    void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException;
+}

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
@@ -177,4 +175,17 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 生成新客户信息
+     * @param orgId
+     * @param person
+     * @param recommender
+     * @param consultant
+     * @param building
+     * @param from
+     * @return
+     * @throws Exception
+     */
+    List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception;
 }

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

@@ -1,6 +1,16 @@
 package com.huiju.estateagents.service;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
+
+import java.time.LocalDate;
+import java.util.List;
 
 /**
  * <p>
@@ -12,4 +22,100 @@ import com.huiju.estateagents.entity.TaChannel;
  */
 public interface TaChannelService extends IService<TaChannel> {
 
+    /**
+     * 渠道引进客户统计
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings);
+
+    /**
+     * 获取注册用户列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 获取渠道下的访问次数列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 获取渠道下的访问人数列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @param channelId
+     * @return
+     */
+    List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 导出
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -174,7 +174,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
 
     @Override
     public boolean advertistExistFlag(ExtendContent extendContent, Integer orgId) {
-        //一个城市只能有一个开屏广告
+        //一个城市、项目只能有一个开屏广告
         if (extendContent.getStatus() == 1 && CommConstant.OPEN_SCREEN.equals(extendContent.getShowType())){
             QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
             if (extendContent.getCityId() == null){
@@ -187,9 +187,14 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             taExtendContentQueryWrapper.eq("org_id", orgId);
             taExtendContentQueryWrapper.eq("status", 1);
             taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
+            taExtendContentQueryWrapper.eq("show_position", extendContent.getShowPosition());
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
+//            taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(String.valueOf(extendContent.getIsHaveActive())), "is_have_active", extendContent.getIsHaveActive());
+            if (null != extendContent.getIsHaveActive() && CommConstant.BANNER_BUILDING.equals(extendContent.getShowPosition())){
+                taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
+            }
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
             if (!Collections.isEmpty(extContentInfo)){
                 return false;

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

@@ -335,15 +335,21 @@ public class MiniAppServiceImpl implements IMiniAppService {
         String scene = params.getString("scene");
         String page = StringUtils.ifNull(params.getString("page"), "");
         Integer width = params.getInteger("width");
-        if (null == width) width = 430;
+        if (null == width) {
+            width = 430;
+        }
 
         Boolean autoColor = params.getBoolean("auto_color");
-        if (null == autoColor) autoColor = false;
+        if (null == autoColor) {
+            autoColor = false;
+        }
 
         String lineColorStr = StringUtils.ifNull(params.getString("line_color"), "{\"r\":0,\"g\":0,\"b\":0}");
         WxMaCodeLineColor lineColor = JSONObject.parseObject(lineColorStr, WxMaCodeLineColor.class);
         Boolean isHyaline = params.getBoolean("is_hyaline");
-        if (null == isHyaline) isHyaline = true;
+        if (null == isHyaline) {
+            isHyaline = true;
+        }
 
         try {
 
@@ -352,6 +358,10 @@ public class MiniAppServiceImpl implements IMiniAppService {
             taQrcode.setCreateDate(LocalDateTime.now());
             taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
             taQrcode.setQrParams(paramsStr);
+            if (scene.indexOf("&qrCodeId=") > -1) {
+                String str = scene.substring(scene.indexOf("&qrCodeId=") + 10);
+                taQrcode.setTargetId(Integer.parseInt(str.substring(0, str.indexOf("&"))));
+            }
 
             boolean success = taMiniappQrcodeMapper.insert(taQrcode) > 0;
             if (!success) {

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

@@ -123,6 +123,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaRaiseInviteService iTaRaiseInviteService;
 
+    @Autowired
+    private IExtendContentService iExtendContentService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -227,7 +230,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId) {
+    public ResponseBean      buildingAllSelectId(String id, TaPerson person, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
@@ -343,6 +346,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
         List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
 
+        // 查询关联项目的开屏广告
+        QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+        taExtendContentQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        taExtendContentQueryWrapper.eq("building_id", id);
+        taExtendContentQueryWrapper.eq("org_id", orgId);
+        taExtendContentQueryWrapper.eq("show_type", CommConstant.OPEN_SCREEN);
+        taExtendContentQueryWrapper.eq("show_position", CommConstant.BANNER_BUILDING);
+        List<ExtendContent> taExtendContents = iExtendContentService.list(taExtendContentQueryWrapper);
+        building.setExtendContent(taExtendContents);
+
+
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
             // 查询批次下认筹是否开启邀请制

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

@@ -1,10 +1,25 @@
 package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.List;
+
 /**
  * <p>
  *   服务实现类
@@ -16,4 +31,192 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel> implements TaChannelService {
 
+    @Autowired
+    private TaChannelMapper taChannelMapper;
+
+    /**
+     * 渠道引进客户统计
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings) {
+        IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        if(StringUtils.isEmpty(sortField)){
+            sortField = "new_customers";
+            orderType = "desc";
+        }
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType,taPersonBuildings);
+        List<TsActivityDaily> records = data.getRecords();
+        records.forEach(e -> {
+            List<ChannelVisitPersonNum> channelPersonNumListExport = taChannelMapper.getChannelPersonNumListExport(orgId, channelId, e.getTargetId(), e.getTargetType(), buildingId, startDate, endDate);
+            e.setVisitPersons(channelPersonNumListExport.size());
+        });
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 获取注册用户列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        IPage<ChannelAddRegistNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 获取渠道下的访问次数列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        IPage<ChannelVisitNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 获取渠道下的访问人数列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        IPage<ChannelVisitPersonNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @param channelId
+     * @return
+     */
+    @Override
+    public List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings) {
+        List<TsChannelDaily> channelIntroductionListExport = taChannelMapper.getChannelIntroductionListExport(orgId, startDate, endDate, channelType, buildingId, channelId,taPersonBuildings);
+        channelIntroductionListExport.forEach(e -> {
+            List<ChannelVisitPersonNum> channelPersonNumListExport = taChannelMapper.getChannelPersonNumListExport(orgId, channelId, e.getTargetId(), e.getTargetType(), buildingId, startDate, endDate);
+            e.setVisitPersons(channelPersonNumListExport.size());
+
+            String message = "";
+            switch (e.getTargetType()){
+                case "building":
+                    message = "项目";
+                    break;
+                case "activity":
+                    message = "常规活动";
+                    break;
+                case "help":
+                    message = "助力活动";
+                    break;
+                case "group":
+                    message = "拼团活动";
+                    break;
+                case "h5":
+                    message = "H5活动";
+                    break;
+                case "live":
+                    message = "直播活动";
+                    break;
+                case "news":
+                    message = "资讯";
+                    break;
+                case "house":
+                    message = "在线选房";
+                    break;
+            }
+            e.setTargetType(message);
+        });
+        return channelIntroductionListExport;
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelAddRegistNum> getNewuserListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelNewuserListExport(orgId, channelId, targetId,targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelVisitNum> getVisitNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelVisitNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
+
+    /**
+     * 导出
+     *
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate) {
+        return taChannelMapper.getChannelPersonNumListExport(orgId, channelId, targetId, targetType, buildingId,startDate,endDate);
+    }
 }

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

@@ -104,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
-        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
-                    "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
-                liveActivityTitle, cityId, buildingId, status);
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId,
+                                                             Integer userId, Integer source) {
+        logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{},iveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{},source:{}",
+                pageNum, pageSize, liveActivityTitle, cityId, buildingId, status, source);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId, taPersonBuildingListByUserId, userId, source);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -310,6 +311,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             }
             //获取楼盘信息
             taBuilding = taBuildingMapper.selectById(buildingList.get(0).getBuildingId());
+            if (null == taBuilding) {
+                taBuilding = new TaBuilding();
+            }
         }
 
         Map<String, Object> result = new HashMap<>();
@@ -412,13 +416,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
 
         TaPerson taPerson = taPersons.get(0);
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("user_id", taPerson.getUserId());
+        TaUser taUser = taUserMapper.selectOne(taUserQueryWrapper);
+
         Map<String, Object> result = new HashMap<>();
         result.put("id", taPerson.getPersonId());
         result.put("name", taPerson.getName());
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("nickname", taPerson.getNickname());
-        result.put("avatar", taPerson.getAvatarurl());
+        result.put("avatar", taUser == null ? taPerson.getAvatarurl() : taUser.getPhoto());
         result.put("sex", taPerson.getSex());
         result.put("phone",StringUtils.ifNull(taPerson.getTel(),taPerson.getPhone()) );
         result.put("points", taPerson.getPoints());
@@ -547,7 +555,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Override
     public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
+        if (null == taPersons || taPersons.size() == 0) {
             TaPerson taPerson = new TaPerson();
             taPerson.setMiniOpenid(openid);
             taPerson.setNickname("匿名用户");
@@ -880,139 +888,84 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
      * @param openid
      * @param phone
      * @param buildingId
-     * @param sceneId
-     * @param targetType
-     * @param targetId
-     * @param targetName
      * @param promoter
+     * @param customerFrom
      * @throws Exception
      */
     @Override
-    public void authPhone(Integer orgId, String openid, String phone, String buildingId, String sceneId, String targetType, String targetId, String targetName, String promoter) throws Exception {
-        log.info("orgId={},openid={},phone={},buildingId={},sceneId={},targetType={},targetId={},targetName={},promoter={}",
-                orgId,openid,phone,buildingId,sceneId,targetType,targetId,targetName,promoter);
+    public void authPhone(Integer orgId,
+                          String openid,
+                          String phone,
+                          String buildingId,
+                          String promoter,
+                          String consultantPersonId,
+                          TaCustomerFrom customerFrom) throws Exception {
+        log.info("orgId={},openid={},phone={},buildingId={},promoter={}, customerFrom={}",
+                orgId,openid,phone,buildingId,promoter, JSONObject.toJSONString(customerFrom));
         //
         LocalDateTime now = LocalDateTime.now();
 
-        // 更新人员手机号
+        // 当前人员
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             throw new Exception("当前人员 openid 异常");
         }
         TaPerson person = persons.get(0);
+        // 更新手机号
         person.setPhone(phone);
+        // 更新授权时间
         person.setAuthPhoneTime(now);
         if (StringUtils.isEmpty(person.getBuildingId())) {
+            // 更新楼盘
             person.setBuildingId(buildingId);
         }
         if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            // 更新人员身份
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
+        if (null != customerFrom.getChannelId() && null == person.getChannelId()) {
+            // 更新渠道
+            person.setChannelId(customerFrom.getChannelId());
+        }
+        if (null != customerFrom.getQrCodeId() && null == person.getQrCodeId()) {
+            // 更新推广码
+            person.setQrCodeId(customerFrom.getQrCodeId());
+        }
         updateById(person);
 
-        // 只要授权手机号, 就是客户
-        // 或者 依据手机号反更新推荐客户中 person_id
-        // 默认场景, 普通人推荐
-        TaRecommendCustomer customer = newOrFixCustomerBy(person, promoter, buildingId);
-
-        // 发放积分
-        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
-
-        //授权手机给推广人加积分
-        String sharePersonId = getSharePersonFrom(person);
-        if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
-            applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
-        }
+        // 关联推荐客户
+        fixCustomerPersonId(person);
 
         // 客户来源
-        TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        customerFrom.setCustomerId(customer.getCustomerId());
-        customerFrom.setTargetType(targetType);
-        customerFrom.setTargetId(targetId);
-        customerFrom.setTargetName(targetName);
-        customerFrom.setOrgId(orgId);
-        customerFrom.setSceneId(sceneId);
-        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
-        customerFrom.setIsProjectFirst(false);
         customerFrom.setCreateDate(now);
 
         // 推广人
         TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
-        // 是否置业顾问
-        boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
-        // 推广人授权的楼盘
-        List<String> withBuildings = isConsultant ? taUserMapper.getBuildingIdsOf(recPerson.getUserId(), null) : null;
         // 推荐楼盘
-        TaBuilding recBuilding = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
-
-        // 传入的楼盘与推广人是否有关联关系
-        boolean isAssociated = null != withBuildings && withBuildings.contains(buildingId);
-
-        // 如果有推荐楼盘
-        if (null != recBuilding) {
-            customerFrom.setBuildingId(buildingId);
-            customerFrom.setBuildingName(recBuilding.getBuildingName());
-            customerFrom.setIsProjectFirst(true);
-
-            // 客户没楼盘 - 小程序级别公客, 则变成项目级别公客
-            if (StringUtils.isEmpty(customer.getBuildingId())) {
-                customer.setBuildingId(buildingId);
-
-                // 如果项目跟推广人是关联关系, 那么就是私客
-                if (isAssociated) {
-                    customer.setRealtyConsultant(recPerson.getUserId().toString());
-                }
-
-                taRecommendCustomerMapper.updateById(customer);
-            }
-        }
+        TaBuilding building = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
+        // 置业顾问
+        boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+        TaPerson consultant = null != consultantPersonId ? getById(consultantPersonId) : (isConsultant ? recPerson : null);
 
-        // 推荐人不为空
-        if (null != recPerson) {
-            customerFrom.setSharePersonId(recPerson.getPersonId());
-            customerFrom.setSharePersonName(recPerson.getNickname());
-
-            // 如果没有关联关系
-            // 置业顾问推荐其他楼盘, 那么需要生成该置业的私客
-            if (isConsultant && !isAssociated) {
-                String consultantBuildingId = null != withBuildings ? withBuildings.get(0) : null;
-                if (!StringUtils.isEmpty(consultantBuildingId)) {
-                    TaBuilding onsultantBuilding = taBuildingMapper.selectById(consultantBuildingId);
-                    TaRecommendCustomer newCustomer = copyByPerosn(person, new TaRecommendCustomer());
-                    newCustomer.setBuildingId(onsultantBuilding.getBuildingId());
-                    newCustomer.setRealtyConsultant(recPerson.getUserId().toString());
-                    newCustomer.setRecommendPerson(recPerson.getPersonId());
-                    newCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-                    newCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
-                    newCustomer.setEntryType(CommConstant.ENTRY_INPUT);
-                    newCustomer.setCreateDate(now);
-                    newCustomer.setReportDate(now);
-                    taRecommendCustomerMapper.insert(newCustomer);
-
-                    TaCustomerFrom customerFrom2 = new TaCustomerFrom();
-                    customerFrom2.setPersonId(person.getPersonId());
-                    customerFrom2.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-                    customerFrom2.setCustomerId(newCustomer.getCustomerId());
-                    customerFrom2.setBuildingId(onsultantBuilding.getBuildingId());
-                    customerFrom2.setBuildingName(onsultantBuilding.getBuildingName());
-                    customerFrom2.setSharePersonId(recPerson.getPersonId());
-                    customerFrom2.setSharePersonName(recPerson.getNickname());
-                    customerFrom2.setTargetType(targetType);
-                    customerFrom2.setTargetId(targetId);
-                    customerFrom2.setTargetName(targetName);
-                    customerFrom2.setOrgId(orgId);
-                    customerFrom2.setSceneId(sceneId);
-                    customerFrom2.setIsOrgFirst(true);
-                    customerFrom2.setIsProjectFirst(true);
-                    customerFrom2.setCreateDate(now);
-                    taCustomerFromMapper.insert(customerFrom2);
+        try {
+            List<TaRecommendCustomer> customerList = iTaRecommendCustomerService.newCustomer(orgId, person, recPerson, consultant, building, customerFrom);
+            if (customerList.size() > 0) {
+                // 发放积分
+                applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
+
+                //授权手机给推广人加积分
+                String sharePersonId = getSharePersonFrom(person);
+                // 2020年5月29日 不清楚加场景限制的原因, 与芳芳讨论 先取消这个限制
+//                if (validateSceneId(customerFrom.getSceneId()) && !StringUtils.isEmpty(sharePersonId)){
+                if (!StringUtils.isEmpty(promoter) || !StringUtils.isEmpty(sharePersonId)){
+                    applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
                 }
             }
+        } catch (Exception e) {
+            throw e;
         }
-
-        taCustomerFromMapper.insert(customerFrom);
     }
 
     private TaRecommendCustomer newOrFixCustomerBy(TaPerson person, String promoter, String buildingId) {
@@ -1322,4 +1275,22 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
 
+    @Override
+    public ResponseBean updateUserPhoto(String photoUrl, String openId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaPerson> taPersons = getPersonsByOpenId(openId);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+        TaUser taUser = new TaUser();
+        taUser.setUserId(taPerson.getUserId());
+        taUser.setPhoto(photoUrl);
+
+        taUserMapper.updateById(taUser);
+        responseBean.addSuccess("修改成功");
+        return responseBean;
+    }
 }

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

@@ -0,0 +1,242 @@
+package com.huiju.estateagents.service.impl;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxQrCodeUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
+import com.huiju.estateagents.mapper.TaQrcodeMapper;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaQrcodeService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 二维码管理表 服务实现类
+ * </p>
+ *
+ * @author fxf
+ * @since 2020-05-20
+ */
+@Service
+public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> implements ITaQrcodeService {
+
+    private Logger logger = LoggerFactory.getLogger(TaQrcodeServiceImpl.class);
+
+    @Autowired
+    private TaQrcodeMapper taQrcodeMapper;
+
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+    @Autowired
+    private TaUserServiceImpl taUserService;
+
+    /**
+     * 条件查询二维码列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param targetType
+     * @param targetName
+     * @param channelId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean listQrCodeByCondition(Integer pageNum, Integer pageSize, String targetType, String targetName, Integer channelId,
+                                              String buildingId, Integer userId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUser taUser = taUserService.getById(userId);
+        if (taUser != null && taUser.getIsAdmin() != null && taUser.getIsAdmin()) {
+            userId = null;
+        }
+
+        IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, userId, orgId, personBuildingList));
+        return responseBean;
+    }
+
+    /**
+     * 保存二维码信息
+     *
+     * @param taQrcode
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 校验是否已有相同的数据
+        QueryWrapper<TaQrcode> qrcodeQueryWrapper = new QueryWrapper<>();
+        qrcodeQueryWrapper.eq("org_id", orgId);
+        if (StringUtils.isBlank(taQrcode.getBuildingId())) {
+            qrcodeQueryWrapper.isNull("building_id");
+        } else {
+            qrcodeQueryWrapper.eq("building_id", taQrcode.getBuildingId());
+        }
+        if (null == taQrcode.getChannelId()) {
+            qrcodeQueryWrapper.isNull("channel_id");
+        } else {
+            qrcodeQueryWrapper.eq("channel_id", taQrcode.getChannelId());
+        }
+        qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
+        qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
+        qrcodeQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        List<TaQrcode> taQrCodeCheckList = taQrcodeMapper.selectList(qrcodeQueryWrapper);
+        if (CollectionUtils.isNotEmpty(taQrCodeCheckList)) {
+            responseBean.addError("请勿重复提交");
+            return responseBean;
+        }
+
+        // 保存数据
+        taQrcode.setOrgId(orgId);
+        taQrcode.setCreateUser(userId);
+        taQrcode.setCreateDate(LocalDateTime.now());
+        taQrcode.setStatus(CommConstant.STATUS_NORMAL);
+        if (!save(taQrcode)) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 获取appId
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+        taMiniappQuery.eq("org_id", orgId);
+        TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
+
+        // 生成二维码
+        String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
+                taQrcode.getTargetId(), taQrcode.getTargetType(), String.valueOf(taQrcode.getChannelId()), String.valueOf(taQrcode.getQrCodeId()), taQrcode.getBuildingId());
+        ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
+        if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
+            // 更新数据
+            taQrcode.setQrCodeUrl((String) qrCodeResult.getData());
+            if (updateById(taQrcode)) {
+                responseBean.addSuccess(taQrcode);
+                return responseBean;
+            }
+        }
+        removeById(taQrcode.getQrCodeId());
+        responseBean.addError("fail");
+        return responseBean;
+    }
+
+    /**
+     * 获取二维码统计
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean getStatisticData(Integer qrCodeId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取二维码信息
+        TaQrcode taQrcode = taQrcodeMapper.selectById(qrCodeId);
+        if (taQrcode == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        // 查询访问总人数
+        Integer visitPersons = taQrcodeMapper.getVisitPersons(qrCodeId, orgId);
+
+        // 查询访问总次数
+        Integer visitNum = taQrcodeMapper.getVisitNum(qrCodeId, orgId);
+
+        // 查询新增用户数
+        Integer newPersons = taQrcodeMapper.getNewPersons(qrCodeId, orgId);
+
+        // 组装反参
+        JSONObject resultObj = new JSONObject();
+        resultObj.put("visitPersons", visitPersons);
+        resultObj.put("visitNum", visitNum);
+        resultObj.put("newPersons", newPersons);
+        resultObj.put("qrCodeInfo", taQrcode);
+        responseBean.addSuccess(resultObj);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean getStatisticRecord(Integer type, Integer pageNum, Integer pageSize, Integer qrCodeId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+        switch (type) {
+            case 1:
+                responseBean.addSuccess(taQrcodeMapper.getVisitPersonsRecord(pg, qrCodeId, orgId));
+                break;
+            case 2:
+                responseBean.addSuccess(taQrcodeMapper.getVisitNumRecord(pg, qrCodeId, orgId));
+                break;
+            case 3:
+                responseBean.addSuccess(taQrcodeMapper.getNewPersonsRecord(pg, qrCodeId, orgId));
+                break;
+            default:
+                responseBean.addError("fail");
+                break;
+        }
+        return responseBean;
+    }
+
+    @Override
+    public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        String fileName;
+        switch (type) {
+            case 1:
+                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId, orgId);
+                fileName = URLEncoder.encode("访问人数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
+                break;
+            case 2:
+                List<QrCodeVisitNum> records2 = taQrcodeMapper.getVisitNumRecordExport(qrCodeId, orgId);
+                fileName = URLEncoder.encode("访问次数", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
+                break;
+            case 3:
+                List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
+                fileName = URLEncoder.encode("新增注册用户", "UTF-8");
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+                EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
+                break;
+            default:
+                break;
+        }
+    }
+}

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

@@ -29,12 +29,17 @@ import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -168,6 +173,213 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return taRecommendCustomerMapper.getConsultantCustomerList(userId, personId, buildingId, orgId);
     }
 
+    @Override
+    public List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception {
+        logger.info("newCustomer 接收参数：orgId：{}，person：{}，recommender：{}，consultant：{}，building：{}，from：{}",
+                orgId, JSONObject.toJSONString(person), JSONObject.toJSONString(recommender), JSONObject.toJSONString(consultant), JSONObject.toJSONString(building), JSONObject.toJSONString(from));
+
+        // 如果置业推荐了非自己绑定楼盘, 会生成 2 条客户记录
+        List<TaRecommendCustomer> result = new ArrayList<>();
+        List<TaBuilding> consultBuildings = null;
+        List<String> consultBuildingIds = null;
+        if (null != consultant) {
+            consultBuildings = taPersonBuildingMapper.getBuildingsOf(consultant.getUserId().toString());
+            if (null != consultBuildings && consultBuildings.size() > 0) {
+                consultBuildingIds = consultBuildings.stream().map(TaBuilding::getBuildingId).collect(Collectors.toList());
+            }
+        }
+
+        //
+        LocalDateTime now = LocalDateTime.now();
+        from.setOrgId(orgId);
+        from.setPersonId(person.getPersonId());
+        from.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        from.setCreateDate(now);
+
+        Map<String, Number> checkNum = taRecommendCustomerMapper.checkCustomerBy(orgId, person.getPersonId(), consultBuildingIds, null != building ? building.getBuildingId() : null);
+        // 是否存在小程序客户记录
+        boolean hasOrgCust = checkNum.get("orgNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘客户记录
+        boolean hasConsultBuildingCust = checkNum.get("consultBuildingNum").intValue() > 0;
+        // 是否存在置业绑定的楼盘私客记录
+        boolean hasConsultCust = checkNum.get("consultNum").intValue() > 0;
+        // 是否存在当前内容楼盘的客户记录
+        boolean hasBuildingCust = checkNum.get("buildingNum").intValue() > 0;
+
+        // 置业与内容楼盘是否有关联关系
+        boolean builingAssociated = false;
+
+        logger.info("newCustomer checkCustomer查询结果：hasOrgCust：{}，hasConsultBuildingCust：{}，hasConsultCust：{}，hasBuildingCust：{}",
+                hasOrgCust, hasConsultBuildingCust, hasConsultCust, hasBuildingCust);
+
+        // 职业顾问不插入客户表
+        boolean personIsConsultant = CommConstant.PERSON_REALTY_CONSULTANT.equals(person.getPersonType()) ? true : false;
+        if (personIsConsultant) {
+            return result;
+        }
+
+        // 置业项目
+        if (null != consultant && CollectionUtils.isNotEmpty(consultBuildings) && !hasConsultCust) {
+            TaBuilding taBuilding = null;
+            if (consultBuildingIds.contains(null != building ? building.getBuildingId() : null)) {
+                taBuilding = building;
+                builingAssociated = true;
+            } else {
+                taBuilding = consultBuildings.get(0);
+            }
+
+            if (hasConsultBuildingCust) {
+                // 如果是项目公客
+                QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+                taRecommendCustomerQueryWrapper.eq("building_id", taBuilding.getBuildingId());
+                taRecommendCustomerQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+                taRecommendCustomerQueryWrapper.orderByAsc("create_date");
+                taRecommendCustomerQueryWrapper.last("limit 1");
+                TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(taRecommendCustomerQueryWrapper);
+
+                taRecommendCustomer = copyFromPerosn(person, taRecommendCustomer);
+                taRecommendCustomer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.updateById(taRecommendCustomer);
+                result.add(taRecommendCustomer);
+            } else {
+                // 如果没有任何置业及置业楼盘相关的数据, 则插入新记录
+                TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+                fillSomeFieldsOfCustomer(customer, recommender, now);
+                customer.setBuildingId(taBuilding.getBuildingId());
+                customer.setBuildingName(taBuilding.getBuildingName());
+                customer.setRealtyConsultant(consultant.getUserId().toString());
+                taRecommendCustomerMapper.insert(customer);
+                result.add(customer);
+
+                // 是否首次进入标识
+                Boolean isFirstOrg = hasOrgCust;
+
+                // 如果非小程序公客, 即首次进入
+                if (!isFirstOrg) {
+                    // 如果分享内容的楼盘跟置业楼盘一致
+                    if (builingAssociated || null  == building ) {
+                        isFirstOrg = true;
+                    }
+                } else {
+                    isFirstOrg = false;
+                }
+
+                TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+                customerFrom.setCustomerId(customer.getCustomerId());
+                customerFrom.setSharePersonId(recommender.getPersonId());
+                customerFrom.setSharePersonName(StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+                customerFrom.setBuildingId(taBuilding.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setIsOrgFirst(isFirstOrg);
+                customerFrom.setIsProjectFirst(true);
+                customerFrom.setCreateDate(now);
+                taCustomerFromMapper.insert(customerFrom);
+
+                if (isFirstOrg) {
+                    hasOrgCust = true;
+                }
+            }
+        }
+
+        // 项目公客
+        if (null != building && !hasBuildingCust && !builingAssociated) {
+            // 校验客户是否已经是该项目公客
+//            QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+//            customerQueryWrapper.eq("org_id", orgId);
+//            customerQueryWrapper.eq("person_id", person.getPersonId());
+//            customerQueryWrapper.eq("building_id", building.getBuildingId());
+//            customerQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+//            customerQueryWrapper.orderByAsc("create_date");
+//            customerQueryWrapper.last("limit 1");
+//            TaRecommendCustomer customerCheck = taRecommendCustomerMapper.selectOne(customerQueryWrapper);
+//            if(customerCheck == null){
+            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+            fillSomeFieldsOfCustomer(customer, recommender, now);
+            customer.setBuildingId(building.getBuildingId());
+            taRecommendCustomerMapper.insert(customer);
+            result.add(customer);
+
+            // 是否首次进入标识
+            Boolean isFirstOrg = hasOrgCust;
+
+            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+            customerFrom.setCustomerId(customer.getCustomerId());
+            customerFrom.setSharePersonId(null == recommender ? null : recommender.getPersonId());
+            customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+            customerFrom.setBuildingId(building.getBuildingId());
+            customerFrom.setBuildingName(building.getBuildingName());
+            customerFrom.setIsOrgFirst(!isFirstOrg);
+            customerFrom.setIsProjectFirst(true);
+            customerFrom.setCreateDate(now);
+            taCustomerFromMapper.insert(customerFrom);
+//            }
+
+            // 如果非小程序公客, 即首次进入
+            if (!isFirstOrg) {
+                hasOrgCust = true;
+            }
+        }
+
+        // 小程序公客
+        if (!hasOrgCust && null == consultant) {
+            TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
+            fillSomeFieldsOfCustomer(customer, recommender, now);
+            taRecommendCustomerMapper.insert(customer);
+            result.add(customer);
+
+            TaCustomerFrom customerFrom = copyPropertiesFrom(from);
+            customerFrom.setCustomerId(customer.getCustomerId());
+            customerFrom.setSharePersonId(null == recommender ? null : recommender.getPersonId());
+            customerFrom.setSharePersonName(null == recommender ? null : StringUtils.ifNull(recommender.getName(), recommender.getNickname()));
+            customerFrom.setIsOrgFirst(true);
+            customerFrom.setIsProjectFirst(false);
+            customerFrom.setCreateDate(now);
+            taCustomerFromMapper.insert(customerFrom);
+        }
+
+        return result;
+    }
+
+    private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
+        customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        customer.setStatus(CommConstant.CUSTOMER_REPORT);
+        customer.setEntryType(null == recommender ? CommConstant.ENTRY_VOLUNTEER : CommConstant.ENTRY_INPUT);
+        customer.setCreateDate(now);
+        customer.setReportDate(now);
+//        customer.setRecommendPerson(null == recommender ? null : recommender.getPersonId());
+    }
+
+    private TaRecommendCustomer copyFromPerosn(TaPerson person, TaRecommendCustomer cust) {
+        cust.setPersonId(person.getPersonId());
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(StringUtils.ifNull(person.getPhone(), person.getTel()));
+        cust.setPicture(StringUtils.ifNull(person.getAvatarurl(), person.getPhoto()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        cust.setOrgId(person.getOrgId());
+
+        return cust;
+    }
+
+    private TaCustomerFrom copyPropertiesFrom(TaCustomerFrom from) {
+        BeanCopier copier = BeanCopier.create(TaCustomerFrom.class, TaCustomerFrom.class, false);
+        TaCustomerFrom to = new TaCustomerFrom();
+        copier.copy(from, to, null);
+        return to;
+    }
+
+    public void delPubCust(String personId, String buildingId) {
+        TaRecommendCustomer recommendCustomer = new TaRecommendCustomer();
+        recommendCustomer.setStatus(CommConstant.STATUS_DELETE);
+
+        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+        taRecommendCustomerQueryWrapper.eq("building_id", buildingId);
+        taRecommendCustomerQueryWrapper.eq("person_id", personId);
+        taRecommendCustomerMapper.update(recommendCustomer, taRecommendCustomerQueryWrapper);
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
@@ -1108,4 +1320,5 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
         customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
     }
+
 }

src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java

@@ -291,7 +291,7 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "personId", required = false)String personId,
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -339,7 +339,7 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -364,7 +364,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -240,7 +241,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExport(
@@ -267,7 +269,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExport(
@@ -280,7 +283,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
@@ -291,7 +295,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExportByPersonId(
@@ -301,7 +306,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitNum> selectActivityVisitNumByPersonId(
@@ -312,7 +318,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExportByPersonId(

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
@@ -151,13 +152,13 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
+    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId, List<TaPersonBuilding> taPersonBuildings){
         IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taPersonBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taPersonBuildings);
         }
 
         return ResponseBean.success(data);
@@ -173,24 +174,48 @@ public class TaActivityStaticServiceImpl {
         return list;
     }
 
-    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+    public ResponseBean selectActivityVisitPersonNum(Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer orgId,
+                                                     LocalDate startDate,
+                                                     LocalDate endDate,
+                                                     String personFrom,
+                                                     String provice,
+                                                     String realtyConsultant,
+                                                     String realtyConsultantPhone,
+                                                     String activityId,
+                                                     String activityType,
+                                                     String buildingId,
+                                                     String personId,
+                                                     List<TaPersonBuilding> taBuildings){
         IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitPersonNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
 
         return ResponseBean.success(data);
     }
 
-    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId,
+                                                                   LocalDate startDate,
+                                                                   LocalDate endDate,
+                                                                   String personFrom,
+                                                                   String provice,
+                                                                   String realtyConsultant,
+                                                                   String realtyConsultantPhone,
+                                                                   String activityId,
+                                                                   String activityType,
+                                                                   String buildingId,
+                                                                   String personId,
+                                                                   List<TaPersonBuilding> taBuildings){
         List<VisitPersonNum> list = new ArrayList<>();
         if (StringUtils.isEmpty(personId)){
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
         return list;
     }

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

@@ -165,7 +165,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     }
 
     /**
-     * 第三方生成二维码
+     * 第三方生成
      * @return
      */
     @PostMapping("/third/qrcode")

src/main/resources/log/logback-spring.xml

@@ -22,9 +22,9 @@
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
         <!--日志文件最大的大小-->
-<!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-<!--            <MaxFileSize>10MB</MaxFileSize>-->
-<!--        </triggeringPolicy>-->
+        <!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--            <MaxFileSize>10MB</MaxFileSize>-->
+        <!--        </triggeringPolicy>-->
     </appender>
 
     <!-- 按照每天生成日志文件 -->
@@ -40,9 +40,9 @@
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
         <!--日志文件最大的大小-->
-<!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
-<!--                    <MaxFileSize>1024MB</MaxFileSize>-->
-<!--                </triggeringPolicy>-->
+        <!--                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--                    <MaxFileSize>1024MB</MaxFileSize>-->
+        <!--                </triggeringPolicy>-->
     </appender>
 
     <!--myibatis log configure-->

src/main/resources/mapper/TaChannelMapper.xml

@@ -33,11 +33,14 @@
         c.*,
         count(tp.person_id) AS brokerCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
+        IFNULL(ts.customerNum,0) as customerNum,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
         LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
+        LEFT JOIN (
+        SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_channel_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id) ts on c.channel_id = ts.channel_id
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
@@ -65,4 +68,398 @@
         GROUP BY c.channel_id
     </select>
 
+    <select id="getChannelIntroductionList" resultType="com.huiju.estateagents.entity.TsActivityDaily">
+        SELECT
+            serial_no,
+            statis_date,
+            org_id,
+            building_id,
+            building_name,
+            target_id,
+            target_type,
+            target_name,
+            sum( share_num ) AS share_num,
+            sum( share_persons ) AS share_persons,
+            sum( visit_num ) AS visit_num,
+            sum( visit_persons ) AS visit_persons,
+            sum( new_persons ) AS new_persons,
+            sum( new_customers ) AS new_customers,
+            qr_code_id,
+            channel_id
+        FROM
+            ts_channel_daily
+        WHERE
+            channel_id = #{channelId}
+        AND org_id = #{orgId}
+        <if test="startDate != null and endDate != null">
+            AND statis_date BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="channelType != null and channelType != ''">
+            and target_type = #{channelType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
+        GROUP BY   target_id, target_type
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
+    </select>
+    <select id="getChannelNewuserList"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
+        SELECT
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        t.create_date
+        FROM ta_customer_from t
+        left join ta_person a on t.person_id = a.person_id
+<!--        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1-->
+<!--        left join td_wx_dict b1 on b.scene_id = b1.scene_id-->
+<!--        left join ta_recommend_customer c on c.person_id = t.person_id and c.realty_consultant is not null-->
+<!--        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id-->
+<!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
+        WHERE t.org_id = #{orgId}
+        and t.is_org_first = 1
+        and DATE_FORMAT(t.create_date, '%Y-%m-%d' )  >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate},
+        '%Y-%m-%d' )
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = #{activityType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        group by t.person_id order by t.create_date desc
+    </select>
+    <select id="getChannelVisitNumList" resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
+        t.visit_time as visitDate
+        From (
+        SELECT
+        t.person_id, t.visit_time, t.share_person_id
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list' , 'poster')
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+                        when #{targetType} = 'h5' then t.event_type = 'h5'
+                        when #{targetType} = 'news' then t.event_type = 'news'
+                        when #{targetType} = 'building' then t.event_type = 'building'
+                        when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' )  >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' )  &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        ) t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on t.share_person_id = e.person_id
+        group by t.visit_time
+        order by t.visit_time desc
+    </select>
+    <select id="getChannelPersonNumList"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        t.create_date as visitDate,
+        e.nickName as sharePersonName,
+        t.visitNum
+        from (
+        SELECT
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list' , 'poster')
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        GROUP BY
+        t.person_id ) as t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time = 1
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
+        group by t.person_id
+        order by t.create_date desc
+    </select>
+    <select id="getChannelIntroductionListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily">
+        SELECT
+        serial_no,
+        statis_date,
+        org_id,
+        building_id,
+        building_name,
+        target_id,
+        target_type,
+        target_name,
+        sum( share_num ) AS share_num,
+        sum( share_persons ) AS share_persons,
+        sum( visit_num ) AS visit_num,
+        sum( visit_persons ) AS visit_persons,
+        sum( new_persons ) AS new_persons,
+        sum( new_customers ) AS new_customers,
+        qr_code_id,
+        channel_id
+        FROM
+        ts_channel_daily
+        WHERE
+        channel_id = #{channelId}
+        AND org_id = #{orgId}
+        <if test="startDate != null and endDate != null">
+            AND statis_date BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="channelType != null and channelType != ''">
+            and target_type = #{channelType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
+        GROUP BY   target_id, target_type
+    </select>
+    <select id="getChannelNewuserListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
+        SELECT
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        t.create_date
+        FROM ta_customer_from t
+        left join ta_person a on t.person_id = a.person_id
+        <!--        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1-->
+        <!--        left join td_wx_dict b1 on b.scene_id = b1.scene_id-->
+        <!--        left join ta_recommend_customer c on c.person_id = t.person_id and c.realty_consultant is not null-->
+        <!--        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id-->
+        <!--        LEFT JOIN ta_person e ON t.share_person_id = e.person_id-->
+        WHERE t.org_id = #{orgId}
+        and t.is_org_first = 1
+                and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and DATE_FORMAT(t.create_date, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate},
+                '%Y-%m-%d' )
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = #{activityType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        group by t.person_id order by t.create_date desc
+    </select>
+    <select id="getChannelVisitNumListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
+        t.visit_time as visitDate
+        From (
+        SELECT
+        t.person_id, t.visit_time, t.share_person_id
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list', 'poster' )
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        ) t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on t.share_person_id = e.person_id
+        group by t.visit_time
+        order by t.visit_time desc
+    </select>
+    <select id="getChannelPersonNumListExport"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        t.create_date as visitDate,
+        e.nickName as sharePersonName,
+        t.visitNum
+        from (
+        SELECT
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` in ( 'detail', 'house_list', 'poster' )
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5',
+        'news',
+        'building',
+        'live',
+        'house'
+        )
+        AND t.org_id = #{orgId}
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic'
+            when #{targetType} = 'h5' then t.event_type = 'h5'
+            when #{targetType} = 'news' then t.event_type = 'news'
+            when #{targetType} = 'building' then t.event_type = 'building'
+            when #{targetType} = 'house' then t.event_type = 'house'
+            else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        GROUP BY
+        t.person_id ) as t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time = 1
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
+        group by t.person_id
+        order by t.create_date desc
+    </select>
+
 </mapper>

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -22,31 +22,48 @@
     </update>
 
     <select id="selectLiveListByCondition" resultType="com.huiju.estateagents.entity.TaLiveActivity">
-     select a.building_name,b.name as city_name,c.user_name as createName,d.user_name as updateName, t.* From ta_live_activity t
-     left join ta_building a on t.building_id = a.building_id
-     LEFT JOIN td_city b on t.city_id = b.id
-     left join ta_user c on t.create_user = c.user_id
-     left join ta_user d on t.update_user = d.user_id
+     select
+        a.building_name,
+        b.name as city_name,
+        c.user_name as createName,
+        d.user_name as updateName,
+        t.*
+     From
+        ta_live_activity t
+         left join ta_building a on t.building_id = a.building_id
+         LEFT JOIN td_city b on t.city_id = b.id
+         left join ta_user c on t.create_user = c.user_id
+         left join ta_user d on t.update_user = d.user_id
      where t.org_id = #{orgId} and t.status != -1
-     <if test="status != null">
-         and t.status = #{status}
-     </if>
-     <if test="liveActivityTitle != null and liveActivityTitle != ''">
-         and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
-     </if>
-     <if test="cityId != null and cityId != ''">
-         and t.city_id = #{cityId}
-     </if><if test="buildingId != null and buildingId != ''">
-         and t.building_id = #{buildingId}
-    </if>
-    <if test="personBuildingList != null and personBuildingList.size > 0">
-        AND (t.building_id in
-        <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-            #{personBuilding.buildingId}
-        </foreach>
-        or t.create_user = #{userId})
-    </if>
-        order by t.weight desc
+         <if test="status != null">
+             and t.status = #{status}
+         </if>
+         <if test="liveActivityTitle != null and liveActivityTitle != ''">
+             and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
+         </if>
+         <if test="cityId != null and cityId != ''">
+             and t.city_id = #{cityId}
+         </if>
+         <choose>
+             <when test = 'source == 2'>
+                 <if test="buildingId == null or buildingId == ''">
+                     and t.building_id is null
+                 </if>
+             </when>
+             <otherwise>
+                 <if test="buildingId != null and buildingId != ''">
+                     and t.building_id = #{buildingId}
+                 </if>
+             </otherwise>
+         </choose>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+            or t.create_user = #{userId})
+        </if>
+            order by t.weight desc
     </select>
     <select id="getDetailById" resultType="com.huiju.estateagents.entity.TaLiveActivity">
         select t.*,a.live_plat_name as liveAppName From ta_live_activity t

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaQrcodeMapper">
+
+    <select id="listQrCodeByCondition" resultType="com.huiju.estateagents.entity.TaQrcode">
+    SELECT
+        t.*,
+        t2.building_name,
+        t3.channel_name
+    FROM
+        ta_qrcode t
+        LEFT JOIN ta_building t2 ON t.building_id = t2.building_id
+        LEFT JOIN ta_channel t3 ON t.channel_id = t3.channel_id
+    WHERE
+        t.`status` > - 1
+        AND t.org_id = #{orgId}
+        <if test = "buildingId != '' and buildingId != null">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test = "targetType != '' and targetType != null">
+            AND t.target_type = #{targetType}
+        </if>
+        <if test = "targetName != '' and targetName != null">
+            AND t.target_name like concat ('%',#{targetName},'%')
+        </if>
+        <if test = "channelId != null">
+            AND t.channel_id = #{channelId}
+        </if>
+        <if test = "userId != null">
+            AND t.create_user = #{userId}
+        </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+                OR t.building_id is null)
+        </if>
+      ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="getVisitPersons" resultType="java.lang.Integer">
+        SELECT
+            count( DISTINCT t.person_id )
+        FROM
+            ta_person_visit_record t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+    </select>
+
+    <select id="getVisitNum" resultType="java.lang.Integer">
+        SELECT
+            count( * )
+        FROM
+            ta_person_visit_record t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+    </select>
+
+    <select id="getNewPersons" resultType="java.lang.Integer">
+        SELECT
+            count( DISTINCT t.person_id )
+        FROM
+            ta_customer_from t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.is_org_first =1
+            AND t.qr_code_id = #{qrCodeId}
+    </select>
+
+    <select id="getVisitPersonsRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            IFNULL(t2.`name`,t2.nickname) userName,
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city,
+            count(*) accessCount
+        FROM
+            ta_person_visit_record t
+            left join ta_person t2 on t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.person_id
+	    ORDER BY
+		    t.visit_time DESC
+    </select>
+
+    <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
+        SELECT
+            IFNULL( t2.`name`, t2.nickname ) nickName,
+            t2.phone phone,
+            (case t2.gender when 1 then '男' when 2 then '女' else '未知' end)  gender,
+            t3.shortname province,
+            count( * ) visitNum
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+            t.person_id
+        ORDER BY
+		    t.visit_time DESC
+    </select>
+
+    <select id="getVisitNumRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            IFNULL( t2.`name`, t2.nickname ) userName,
+            t2.phone userTel,
+            t2.gender sex,
+            t3.shortname city
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
+    </select>
+
+    <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
+        SELECT
+            IFNULL( t2.`name`, t2.nickname ) nickName,
+            t2.phone phone,
+             (case t2.gender when 1 then '男' when 2 then '女' else '未知' end) gender,
+            t3.shortname province,
+			t.visit_time visitTime
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qr_code_id = #{qrCodeId}
+        ORDER BY
+            t.visit_time desc
+    </select>
+
+    <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
+        SELECT
+            t.*,
+            t2.`name` userName,
+            t2.phone userTel,
+            t2.sex,
+            t3.shortname city,
+            t2.create_date registerTime
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.is_org_first =1
+            AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
+	    order by
+	        t2.create_date desc
+    </select>
+
+    <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
+        SELECT
+            t2.`name` nickName,
+            t2.phone,
+            (case t2.sex when 1 then '男' when 2 then '女' else '未知' end) gender,
+            t3.shortname province,
+            t2.create_date registerTime
+        FROM
+            ta_customer_from t
+            LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
+            LEFT JOIN td_city t3 ON t2.city = t3.id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.is_org_first =1
+            AND t.qr_code_id = #{qrCodeId}
+        GROUP BY
+	        t.customer_id
+	    order by
+	        t2.create_date desc
+    </select>
+
+</mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -3,32 +3,32 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaRecommendCustomerMapper">
     <select id="getMyCutsomerNum" resultType="int">
         SELECT
-            count(*) AS total
+        count(*) AS total
         FROM
-            ta_recommend_customer t
+        ta_recommend_customer t
         WHERE
-            t.recommend_person = #{personId}
-            AND t.status &gt; -1
+        t.recommend_person = #{personId}
+        AND t.status &gt; -1
     </select>
     <select id="getCustomerPersonId" resultType="java.lang.String">
         SELECT
-	person_id
-FROM
-	ta_customer_person
-WHERE
-	customer_id = #{customerId}
+        person_id
+        FROM
+        ta_customer_person
+        WHERE
+        customer_id = #{customerId}
     </select>
 
     <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-      SELECT
-	a.*,
-	(select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time asc LIMIT 1) as visitTime,
-	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
-FROM
-	ta_recommend_customer a
-	LEFT JOIN ta_person_visit_record c ON a.person_id = c.person_id
-	where a.customer_id = #{customerId}
-	GROUP BY a.customer_id
+        SELECT
+        a.*,
+        (select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time asc LIMIT 1) as visitTime,
+        (SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person_visit_record c ON a.person_id = c.person_id
+        where a.customer_id = #{customerId}
+        GROUP BY a.customer_id
     </select>
 
     <select id="getRecCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -86,16 +86,19 @@ FROM
         tc.channel_name as channelName
         FROM
         ta_person a
-        left join ta_channel_person tcp on a.person_id = tcp.person_id
+        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
             a.person_type in ('estate agent', 'channel agent')
             and a.status >0
             <if test="name != null and name !=''">
-                and a.nickname = #{name}
+                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{tel}
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != '' ">
+                and tc.channel_id = #{channelId}
             </if>
             <if test="orgId != null">
                 and a.org_id = #{orgId}
@@ -176,8 +179,8 @@ FROM
         <if test="orgId != null">
             and p.org_id = #{orgId}
         </if>
+        --         LEFT JOIN ta_person c on p.share_person_id = c.person_id
+        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
         LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
@@ -240,13 +243,13 @@ FROM
         order by a.create_date desc
     </select>
     <select id="getCustomerById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
-         SELECT
-	a.*,
-	b.name as consultantName
-FROM
-	ta_recommend_customer a
-	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-	WHERE a.customer_id = #{customerId}
+        SELECT
+        a.*,
+        b.name as consultantName
+        FROM
+        ta_recommend_customer a
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        WHERE a.customer_id = #{customerId}
     </select>
 
     <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -306,6 +309,9 @@ FROM
             <if test="belongStatus == 0">
                 and (t.building_id = ''  OR t.building_id is null )
             </if>
+            <if test="belongStatus == 1">
+                and t.building_id is not null
+            </if>
         </where>
         order by t.create_date desc
     </select>
@@ -487,10 +493,10 @@ FROM
 
     <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
         SELECT
-        a.nickname as nickname,
+        ifnull( a.name, a.nickname) as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
-        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
+        '专业经纪人' as personType,
         tc.channel_name as channelName,
         (
         SELECT
@@ -507,12 +513,11 @@ FROM
         ta_recommend_customer tarc
         WHERE
         tarc.recommend_person = a.person_id
-        and tarc.status = 1
         and tarc.org_id = #{orgId}
         ) AS recommedCount
         FROM
         ta_person a
-        left join ta_channel_person tcp on a.person_id = tcp.person_id
+        left join ta_channel_person tcp on a.person_id = tcp.person_id and tcp.status = 1
         left join ta_channel tc on tc.channel_id = tcp.channel_id
         <where>
             ifnull(a.person_type, '') in ('channel agent', 'estate agent')
@@ -520,6 +525,15 @@ FROM
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="name != null and name != ''">
+                and (a.nickname like concat('%', #{name}, '%') or  a.name like concat('%', #{name}, '%'))
+            </if>
+            <if test="tel != null and tel != null">
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != ''">
+                and tc.channel_id = #{channelId}
+            </if>
 
         </where>
 
@@ -568,8 +582,8 @@ FROM
         IF( t.sex = 1, '男', IF ( t.sex = 2, '女', '未知' ) ) AS sex,
         t.create_date,
         concat( t.country, t.province ) AS province,
-        t.intention,
-        IF(t.building_id = null or t.building_id = '','否','是') AS belongStatus,
+        z.intention,
+        IF(t.building_id is null or t.building_id = '','否','是') AS belongStatus,
         IFNULL( t2.building_name, '暂无' ) AS buildingName,
         t5.scene_alias as sceneType,
         ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
@@ -584,6 +598,7 @@ FROM
         LEFT JOIN td_wx_dict t5 ON t4.scene_id = t5.scene_id
         LEFT JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
         person_id) t6 on t.person_id = t6.person_id
+        left join (select sum(ti.intention) as intention,ti.person_id From ta_person_intention_record ti where ti.org_id = #{orgId} group by ti.person_id) z on z.person_id = t.person_id
         WHERE
         t.`status` > 0
         AND t.verify_status = 1
@@ -607,6 +622,12 @@ FROM
         <if test="sex != null and sex !=''">
             and t.sex = #{sex}
         </if>
+        <if test="startCreateDate != null and startCreateDate !=''">
+            and t.create_Date >= #{startCreateDate}
+        </if>
+        <if test="endCreateDate != null and endCreateDate !=''">
+            and t.create_Date &lt;= #{endCreateDate}
+        </if>
         <if test="personBuildingList != null and personBuildingList.size > 0">
             AND t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -619,6 +640,10 @@ FROM
         <if test="belongStatus == 0">
             and (t.building_id = ''  OR t.building_id is null )
         </if>
+        <if test="belongStatus == 1">
+            and t.building_id is not null
+        </if>
+        order by t.create_date desc
     </select>
     <!--    limit #{pageCode}, #{pageSize}-->
 
@@ -663,6 +688,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and a.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and a.create_Date &lt;= #{endCreateDate}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -704,9 +735,6 @@ FROM
         LEFT JOIN ta_person p2 ON a.person_id = p2.person_id
         LEFT JOIN ta_person c ON p2.recommend_person = c.person_id
         left join ta_building t on a.building_id = t.building_id
         left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY
         person_id) s on a.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id =
@@ -746,6 +774,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="startCreateDate != null and startCreateDate !=''">
+                and a.create_Date >= #{startCreateDate}
+            </if>
+            <if test="endCreateDate != null and endCreateDate !=''">
+                and a.create_Date &lt;= #{endCreateDate}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -816,9 +850,9 @@ FROM
 
     <select id="getMyCustDetailById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
-            *
+        *
         FROM
-            ta_recommend_customer
+        ta_recommend_customer
         where customer_id = #{customerId}
     </select>
 
@@ -877,17 +911,66 @@ FROM
         order by s.report_date desc
     </select>
 
+    <select id="getCustomerByProjectOrOrg" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+        *
+        FROM
+        ta_recommend_customer t
+        WHERE
+        t.org_id = #{orgId}
+        AND t.person_id = #{personId}
+        ORDER BY
+        IF( t.building_id = #{buildingId}, 0, 1 ) ASC,
+        IF( ifnull( t.building_id, '' ) = '', 0, 1 ) ASC,
+        t.create_date ASC
+        LIMIT 1
+    </select>
+
     <select id="getConsultantCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
         SELECT
-            *
+        *
         FROM
-            ta_recommend_customer t
+        ta_recommend_customer t
         WHERE
-            t.org_id = #{orgId}
-            AND t.STATUS > 0
-            AND t.verify_status = 1
-            AND t.realty_consultant IN ( #{userId}, #{personId})
+        t.org_id = #{orgId}
+        AND t.STATUS > 0
+        AND t.verify_status = 1
+        AND t.realty_consultant IN ( #{userId}, #{personId})
     </select>
 
+    <select id="checkCustomerBy" resultType="java.util.Map">
+        SELECT
+        count( 1 ) AS orgNum,
+
+        <!--   sum( IF ( t.building_id IN ( 'foo', 'bar' ), 1, 0 ) ) AS consultNum,     -->
+        <choose>
+            <when test="consultBuildingIds != null and consultBuildingIds.size > 0">
+                COALESCE(sum( IF ( t.building_id IN <foreach collection="consultBuildingIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            </when>
+            <otherwise>
+                COALESCE(sum( IF ( t.building_id IN ('****')
+            </otherwise>
+        </choose>
+        , 1, 0 ) ), 0) AS consultBuildingNum,
+
+        <choose>
+            <when test="consultBuildingIds != null and consultBuildingIds.size > 0">
+                COALESCE(sum( IF ( t.building_id IN <foreach collection="consultBuildingIds" item="id" open="(" close=")" separator=",">#{id}</foreach>
+            </when>
+            <otherwise>
+                COALESCE(sum( IF ( t.building_id IN ('****')
+            </otherwise>
+        </choose>
+
+        AND IFNULL(t.realty_consultant, '') != '', 1, 0 ) ), 0) AS consultNum,
+
+        COALESCE(sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0) AS buildingNum
 
+        FROM
+        ta_recommend_customer t
+        WHERE
+        t.org_id = #{orgId}
+        AND t.person_id = #{personId}
+        AND t.status > -1
+    </select>
 </mapper>

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

@@ -2081,6 +2081,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -2143,6 +2149,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -2211,6 +2223,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         t.person_id ) as t
         left join ta_person a on t.person_id = a.person_id

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

@@ -47,29 +47,36 @@
     </select>
     <select id="selectPersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
+
         SELECT
-        sum( tp.from_num ) AS from_num,
-        sum( tp.registered_num ) AS registered_num,
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
-        tp.scene_type
-        FROM
-        ts_person_from_statistic tp
-        WHERE
-        tp.org_id = #{orgId}
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT sum( tp.from_num ) AS from_num, sum( tp.registered_num ) AS registered_num, DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time, tp.scene_type
+        FROM ts_person_from_statistic tp
+        WHERE tp.org_id = #{orgId}
         <if test="startDate != null or endDate != null">
             AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
         </if>
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
-        tp.scene_type
-        ORDER BY tp.create_date
+        GROUP BY DATE_FORMAT( tp.create_date, '%Y-%m-%d' ), tp.scene_type ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
+
     </select>
     <select id="selectNewLinePersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
+
         SELECT
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT
         sum( tp.from_num ) AS from_num,
         sum( tp.registered_num ) AS registered_num,
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
@@ -89,5 +96,7 @@
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
+        order by date.date
     </select>
 </mapper>

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

@@ -62,7 +62,7 @@
             td_biz_event_type b
             <trim prefix="where">
                 <if test="startDate != null or endDate != null">
-                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                    a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
                 </if>
             </trim>
         ) AS temp_date