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

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/MiniAppPageEnum.java

@@ -0,0 +1,90 @@
+package com.huiju.estateagents.common;
+
+/**
+ * 小程序页面枚举
+ *
+ * @author gusy
+ * @date 2020/5/21 15:58
+ */
+public enum MiniAppPageEnum {
+
+    /**
+     * 项目
+     */
+    PROJECT("project", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+
+    /**
+     * 报名活动
+     */
+    ACTIVITY("activity", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+
+    /**
+     * 助力活动
+     */
+    HELP("help", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP("group", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+
+    /**
+     * h5活动
+     */
+    H5("h5", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+
+    /**
+     * 直播活动
+     */
+    LIVE("live", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+
+    /**
+     * 资讯
+     */
+    NEWS("news", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+
+    /**
+     * 在线选房
+     */
+    SALESBATCH("salesBatch", "targetId=%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/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/TaChannelController.java

@@ -1,41 +1,27 @@
 package com.huiju.estateagents.controller;
 
-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.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.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 java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
@@ -260,4 +246,20 @@ 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 = "channelType", required = false)String channelType,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                     @RequestParam(value = "channelId") Integer channelId,
+                                                     HttpServletRequest request) {
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, channelType, buildingId, channelId);
+    }
 }

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

@@ -0,0 +1,200 @@
+package com.huiju.estateagents.controller;
+
+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.google.gson.JsonObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxQrCodeUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.service.IMiniAppService;
+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 java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <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;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+
+    /**
+     * 分页查询列表
+     *
+     * @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 {
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum,pageSize,targetType,targetName,channelId,buildingId,getOrgId(request));
+        } 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 {
+            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(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("/admin/qrCode/getStatisticData")
+    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;
+    }
+}

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

@@ -846,6 +846,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");
@@ -874,7 +876,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 ++;
@@ -896,7 +900,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 ++;
@@ -976,35 +982,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/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/TaMiniappQrcode.java

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

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/mapper/TaChannelMapper.java

@@ -3,9 +3,11 @@ 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.TsActivityDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -39,4 +41,16 @@ 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);
 }

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/TaQrcodeMapper.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaQrcode;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+/**
+ * <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("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,18 +239,19 @@ 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
@@ -240,6 +275,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * 查询 person 对应 楼盘 的客户
      * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
      * 如果没有无小程序级别客户, 则返回最早的一条
+     *
      * @param orgId
      * @param personId
      * @param buildingId
@@ -249,13 +285,14 @@ 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);
 
     /**
      * 校验客户存在记录

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

@@ -0,0 +1,26 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+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;
+
+/**
+ * <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 orgId);
+
+    ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId);
+
+    ResponseBean getStatisticData(Integer qrCodeId, Integer orgId);
+
+}

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

@@ -1,7 +1,10 @@
 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 java.time.LocalDate;
+
 /**
  * <p>
  *   服务类
@@ -12,4 +15,16 @@ 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);
 }

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);
+            JSONObject sceneObj = JSONObject.parseObject(scene);
+            if (!StringUtils.isEmpty(sceneObj.getString("qrCodeId"))) {
+                taQrcode.setTargetId(Integer.parseInt(sceneObj.getString("qrCodeId")));
+            }
 
             boolean success = taMiniappQrcodeMapper.insert(taQrcode) > 0;
             if (!success) {

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

@@ -1,10 +1,18 @@
 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.entity.TaChannel;
+import com.huiju.estateagents.entity.TsActivityDaily;
 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;
+
 /**
  * <p>
  *   服务实现类
@@ -16,4 +24,25 @@ 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) {
+        IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId);
+        return ResponseBean.success(data);
+    }
 }

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

@@ -0,0 +1,140 @@
+package com.huiju.estateagents.service.impl;
+
+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.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.WxQrCodeUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaQrcode;
+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.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <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;
+
+    /**
+     * 条件查询二维码列表
+     *
+     * @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 orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaQrcode> pg = new Page<>(pageNum, pageSize);
+        responseBean.addSuccess(taQrcodeMapper.listQrCodeByCondition(pg, targetType, targetName, channelId, buildingId, orgId));
+        return responseBean;
+    }
+
+    /**
+     * 保存二维码信息
+     *
+     * @param taQrcode
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId) {
+        ResponseBean responseBean = new 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(), taQrcode.getChannelId() + "", taQrcode.getQrCodeId() + "", taQrcode.getBuildingId());
+        ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
+        if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
+            // 更新数据
+            taQrcode.setQrCodeUrl(qrCodeResult.getCode() + "");
+            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;
+        }
+
+        // 获取统计数据
+        QrCodeStatisticResponseBO statisticData = taQrcodeMapper.getStatisticData(orgId);
+
+        // 组装反参
+        JSONObject resultObj = new JSONObject();
+        resultObj.put("statistic", statisticData);
+        resultObj.put("qrCodeInfo", taQrcode);
+        responseBean.addSuccess(resultObj);
+        return responseBean;
+    }
+}

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/mapper/TaChannelMapper.xml

@@ -33,11 +33,15 @@
         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(z.customerNum) as customerNum,z.qr_code_id,z.org_id,z.channel_id from (SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_activity_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id
+        union all
+        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) z GROUP BY z.channel_id) ts on c.channel_id = ts.channel_id
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
@@ -65,4 +69,22 @@
         GROUP BY c.channel_id
     </select>
 
+    <select id="getChannelIntroductionList" resultType="com.huiju.estateagents.entity.TsActivityDaily">
+        SELECT
+            *
+        FROM
+            ts_activity_daily
+        WHERE
+            channel_id = #{channelId}
+        AND org_id = #{orgId}
+        UNION ALL
+        SELECT
+            *
+        FROM
+            ts_channel_daily
+        WHERE
+            channel_id = #{channelId}
+            AND org_id = #{orgId}
+    </select>
+
 </mapper>

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -0,0 +1,37 @@
+<?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 == '' or buildingId == null">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test = "targetType == '' or targetType == null">
+            AND t.target_type = #{targetType}
+        </if>
+        <if test = "targetName == '' or targetName == null">
+            AND t.target_name = #{targetName}
+        </if>
+        <if test = "channelId == null">
+            AND t.channel_id = #{channelId}
+        </if>
+      ORDER BY
+        t.create_date DESC
+    </select>
+
+    <select id="getStatisticData" resultType="com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO">
+
+    </select>
+
+</mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -622,6 +622,12 @@
         <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=",">
@@ -682,6 +688,12 @@
             <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=",">
@@ -723,9 +735,6 @@
         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 ta_person c ON p.share_person_id = c.person_id
-        --         left join ta_building t on a.building_id = t.building_id
-        --         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_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 =
@@ -765,6 +774,12 @@
             <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=",">