feats

src/main/java/com/yunzhi/marketing/controller/MiniAppController.java

@@ -111,6 +111,9 @@ public class MiniAppController extends BaseController {
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    public TaChannelService taChannelService;
+
     /**
      * 验证接入
      */
@@ -248,6 +251,10 @@ public class MiniAppController extends BaseController {
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
+            if (CommConstant.PERSON_ESTATE_CHANNEL.equals(taPerson.getPersonType())) {
+                taPerson.setChannelList(taChannelService.getListByPerson(taPerson));
+            }
+
             // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
 //            ExecutorService threadPool = Executors.newCachedThreadPool();
 //            threadPool.execute(() -> {

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -220,7 +220,7 @@ public class TaPersonController extends BaseController {
         if(StringUtils.isEmpty(channelCode)){
             person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
         }else {
-            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
+            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             queryWrapper.eq("org_id",orgId);

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -228,11 +228,11 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/channel/report")
-    @ApiOperation(value = "森哥看这里-wx-渠道顾问报备客户", notes = "森哥看这里-wx-渠道顾问报备客户")
+    @ApiOperation(value = "wx-渠道顾问报备客户", notes = "森哥看这里-wx-渠道顾问报备客户")
     public ResponseBean channelReportCust(@RequestBody ChannelReportDTO channelReportDTO, HttpServletRequest request) throws Exception {
-        String openid = getOpenId(request);
+        String personId = getPersonId(request);
         Integer orgId = getOrgId(request);
-        channelReportDTO.setOpenid(openid);
+        channelReportDTO.setPersonId(personId);
         channelReportDTO.setOrgId(orgId);
         return taRecommendCustomerService.channelReportCust(channelReportDTO);
     }
@@ -567,12 +567,8 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping("/wx/customer/recommend/mine")
     public ResponseBean getWxCustomersIRecommended(@RequestParam int pageNumber, @RequestParam int pageSize, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        String openid = getOpenId(request);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
+        String personId = getPersonId(request);
+        TaPerson person = taPersonService.getById(personId);
         try {
             return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber, pageSize, person.getPersonId(), orgId, null));
         } catch (Exception e) {

src/main/java/com/yunzhi/marketing/dto/ChannelReportDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class ChannelReportDTO {
 
-    private String openid;
+    private String personId;
 
     private Integer orgId;
 

src/main/java/com/yunzhi/marketing/entity/TaPerson.java

@@ -347,4 +347,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String id;
+
+    /**
+     * 经济所属渠道列表
+     */
+    @TableField(exist = false)
+    private List<TaChannel> channelList;
 }

src/main/java/com/yunzhi/marketing/mapper/TaChannelMapper.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.entity.TaChannel;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.entity.TsActivityDaily;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelAddRegistNum;
@@ -72,4 +73,6 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
     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);
+
+    List<TaChannel> getListByPerson(@Param("params") TaPerson taPerson);
 }

src/main/java/com/yunzhi/marketing/service/TaChannelService.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.entity.TaChannel;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelVisitNum;
@@ -118,4 +119,6 @@ public interface TaChannelService extends IService<TaChannel> {
      * @return
      */
     List<ChannelVisitPersonNum> getPersonNumListExport(Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, LocalDate startDate, LocalDate endDate);
+
+    List<TaChannel> getListByPerson(TaPerson taPerson);
 }

src/main/java/com/yunzhi/marketing/service/impl/TaChannelServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaChannel;
+import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.entity.TsActivityDaily;
 import com.yunzhi.marketing.excel.ActivityStatistics.ChannelAddRegistNum;
@@ -219,4 +220,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
     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);
     }
+
+    @Override
+    public List<TaChannel> getListByPerson(TaPerson taPerson) {
+        return taChannelMapper.getListByPerson(taPerson);
+    }
 }

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -363,11 +363,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) throws Exception {
 
         // 当前人员
-        List<TaPerson> persons = getPersonsByOpenId(channelReportDTO.getOpenid());
-        if (null == persons || persons.size() != 1) {
-            throw new Exception("当前人员 openid 异常");
-        }
-        TaPerson person = persons.get(0);
+        TaPerson person = taPersonMapper.getById(channelReportDTO.getPersonId());
 
         // 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
@@ -420,7 +416,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setPicture(channelReportDTO.getPicture());
         channelCustomer.setPhone(channelReportDTO.getPhone());
         channelCustomer.setSex(channelReportDTO.getSex());
-        channelCustomer.setRecommendPerson(channelReportDTO.getRealtyChannel());
+        channelCustomer.setRecommendPerson(channelReportDTO.getPersonId());
         channelCustomer.setCreateDate(LocalDateTime.now());
         channelCustomer.setStatus("1");
         channelCustomer.setChannelId(taChannelPeople.getChannelId());

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -17,6 +17,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 渠道报备客户表  前端控制器
@@ -45,16 +47,28 @@ public class ChannelCustomerController extends BaseController {
     @ApiOperation(value = "admin-渠道报备客户表", notes = "admin-渠道报备客户表")
     @RequestMapping(value="/admin/channelCustomer",method= RequestMethod.GET)
     public ResponseBean channelCustomerList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            @RequestParam(value ="name", required = false) String name,
+                                            @RequestParam(value ="phone", required = false) String phone,
+                                            @RequestParam(value ="recommendPersonName", required = false) String recommendPersonName,
+                                            @RequestParam(value ="recommendPhone", required = false) String recommendPhone,
+                                            @RequestParam(value ="status", required = false) String status,
+                                            HttpServletRequest request){
+        Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<ChannelCustomer> pg = new Page<>(pageNum, pageSize);
-            LambdaQueryWrapper<ChannelCustomer> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(ChannelCustomer::getStatus,"1");
-            queryWrapper.orderByDesc(ChannelCustomer::getCreateDate);
 
-            IPage<ChannelCustomer> result = iChannelCustomerService.page(pg, queryWrapper);
+            IPage<ChannelCustomer> result = iChannelCustomerService.getProfileList(pg,
+                    orgId,
+                    buildingId,
+                    name,
+                    phone,
+                    recommendPersonName,
+                    recommendPhone,
+                    status);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/xlk/entity/ChannelCustomer.java

@@ -1,5 +1,8 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.models.auth.In;
 import lombok.Data;
@@ -28,6 +31,7 @@ public class ChannelCustomer implements Serializable {
     /**
      * 主键
      */
+    @TableId(value = "channel_customer_id", type = IdType.UUID)
     private String channelCustomerId;
 
     /**
@@ -45,6 +49,13 @@ public class ChannelCustomer implements Serializable {
      */
     private String buildingId;
 
+
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
     /**
      * 电话
      */
@@ -85,5 +96,15 @@ public class ChannelCustomer implements Serializable {
      */
     private Integer channelId;
 
+    /**
+     * 推荐人姓名
+     */
+    @TableField(exist = false)
+    private String recommendPersonName;
 
+    /**
+     * 推荐人手机
+     */
+    @TableField(exist = false)
+    private String recommendPhone;
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

@@ -1,8 +1,10 @@
 package com.yunzhi.marketing.xlk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
 
+    IPage<ChannelCustomer> getProfileList(IPage<ChannelCustomer> pg,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("name") String name,
+                                          @Param("phone") String phone,
+                                          @Param("recommendPersonName") String recommendPersonName,
+                                          @Param("recommendPhone") String recommendPhone,
+                                          @Param("status") String status);
+
 }

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.xlk.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
@@ -38,4 +39,13 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @return
      */
     ResponseBean invalidCustomerUpdate(MarkingChannelCustomerDTO params);
+
+    IPage<ChannelCustomer> getProfileList(IPage<ChannelCustomer> pg,
+                                          Integer orgId,
+                                          String buildingId,
+                                          String name,
+                                          String phone,
+                                          String recommendPersonName,
+                                          String recommendPhone,
+                                          String status);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
@@ -192,4 +193,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         }
         return ResponseBean.error("无效操作", ResponseBean.ERROR_UNAVAILABLE);
     }
+
+    @Override
+    public IPage<ChannelCustomer> getProfileList(IPage<ChannelCustomer> pg,
+                                                 Integer orgId,
+                                                 String buildingId,
+                                                 String name,
+                                                 String phone,
+                                                 String recommendPersonName,
+                                                 String recommendPhone,
+                                                 String status) {
+        return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status);
+    }
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -461,5 +461,15 @@
         group by t.person_id
         order by t.create_date desc
     </select>
+    <select id="getListByPerson" resultType="com.yunzhi.marketing.entity.TaChannel">
+        SELECT
+            t.*
+        FROM
+            ta_channel t
+                INNER JOIN ta_channel_person s ON t.channel_id = s.channel_id
+        WHERE
+            t.org_id = #{params.orgId}
+          AND s.person_id = #{params.personId}
+    </select>
 
 </mapper>

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -2,4 +2,40 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper">
 
+    <select id="getProfileList" resultType="com.yunzhi.marketing.xlk.entity.ChannelCustomer">
+        SELECT
+            t.*,
+            s.building_name,
+            m.nickname AS recommend_person_name,
+            m.phone AS recommend_person_phone
+        FROM
+            xlk_channel_customer t
+                LEFT JOIN ta_building s ON t.building_id = s.building_id
+                INNER JOIN ta_person m ON t.recommend_person = m.person_id
+        WHERE
+            t.org_id = #{orgId}
+          <if test="buildingId != null and buildingId != ''">
+              AND t.building_id = #{buildingId}
+          </if>
+          <if test="name != null and name != ''">
+              AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+          </if>
+          <if test="phone != null and phone != ''">
+            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+          </if>
+          <if test="recommendPersonName != null and recommendPersonName != ''">
+            AND m.nickname LIKE CONCAT( '%', #{recommendPersonName}, '%' )
+          </if>
+          <if test="recommendPhone != null and recommendPhone != ''">
+            AND m.phone LIKE CONCAT( '%', #{recommendPhone}, '%' )
+          </if>
+          <if test="status != null and status != ''">
+            AND t.`status` = #{status}
+          </if>
+          <if test="status == null or status == ''">
+            AND t.`status` &gt; -1
+          </if>
+            ORDER BY
+                t.create_date DESC
+    </select>
 </mapper>