111

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

@@ -13,6 +13,7 @@ import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
@@ -180,7 +181,7 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     /**
-     * 推荐客户
+     * 普通客户推荐客户
      *
      * @param paramStr
      * @param request
@@ -194,7 +195,24 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     /**
-     * 报备客户
+     * 渠道顾问报备客户
+     *
+     * @param channelReportDTO
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/channel/report")
+    public ResponseBean channelReportCust(@RequestBody ChannelReportDTO channelReportDTO, HttpServletRequest request) {
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        channelReportDTO.setOpenid(openid);
+        channelReportDTO.setOrgId(orgId);
+        return taRecommendCustomerService.channelReportCust(channelReportDTO);
+    }
+
+
+    /**
+     * 置业顾问报备客户
      *
      * @param paramStr
      * @param request
@@ -207,6 +225,15 @@ public class TaRecommendCustomerController extends BaseController {
         return taRecommendCustomerService.reportCust(paramStr, openid, orgId);
     }
 
+
+    /**
+     * 顾客列表
+     * @param pageNumber
+     * @param pageSize
+     * @param buildingId
+     * @param request
+     * @return
+     */
     @PostMapping("/wx/customer/recommend")
     public ResponseBean getUnSignedCustomerList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,

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

@@ -0,0 +1,41 @@
+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+@Data
+public class ChannelReportDTO {
+
+    private String openid;
+
+    private Integer orgId;
+
+    /**
+     * 渠道顾问personid
+     */
+    private String realtyChannel;
+
+    /**
+     * 电话号码
+     */
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 图片
+     */
+    private String picture;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
 import com.yunzhi.marketing.excel.ReporRecommendCustomer;
@@ -188,4 +189,11 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @throws Exception
      */
     List<TaRecommendCustomer> newCustomer(Integer orgId, TaPerson person, TaPerson recommender, TaPerson consultant, TaBuilding building, TaCustomerFrom from) throws Exception;
+
+    /**
+     * 渠道推荐客户
+     * @param channelReportDTO
+     * @return
+     */
+    ResponseBean channelReportCust(ChannelReportDTO channelReportDTO);
 }

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,6 +15,7 @@ import com.yunzhi.marketing.common.DateUtils;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.drainage.entity.TaDrainage;
 import com.yunzhi.marketing.drainage.mapper.TaDrainageMapper;
+import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
 import com.yunzhi.marketing.excel.ReporRecommendCustomer;
@@ -24,6 +26,8 @@ import com.yunzhi.marketing.statistic.entity.TaCustomerFollowUpRecord;
 import com.yunzhi.marketing.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.mapper.*;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -111,6 +115,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaSharePersonFromMapper taSharePersonFromMapper;
 
+    @Autowired
+    private ChannelCustomerMapper channelCustomerMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -337,6 +344,38 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return result;
     }
 
+    /**
+     * 渠道推荐客户
+     *
+     * @param channelReportDTO
+     * @return
+     */
+    @Override
+    public ResponseBean channelReportCust(ChannelReportDTO channelReportDTO) {
+        // 先查看在ta_recommend_customer 手机号是否存在
+        LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaRecommendCustomer::getPhone,channelReportDTO.getPhone());
+        queryWrapper.eq(TaRecommendCustomer::getBuildingId,channelReportDTO.getBuildingId());
+        List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (taRecommendCustomers.size() > 0) {
+            return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 入渠道推荐客户表
+        ChannelCustomer channelCustomer = new ChannelCustomer();
+        channelCustomer.setBuildingId(channelReportDTO.getBuildingId());
+        channelCustomer.setName(channelReportDTO.getName());
+        channelCustomer.setPicture(channelReportDTO.getPicture());
+        channelCustomer.setPhone(channelReportDTO.getPhone());
+        channelCustomer.setSex(channelReportDTO.getSex());
+        channelCustomer.setRecommendPerson(channelReportDTO.getRealtyChannel());
+        channelCustomer.setCreateDate(LocalDateTime.now());
+        channelCustomer.setStatus("0");
+        channelCustomer.setOrgId(channelReportDTO.getOrgId());
+        channelCustomerMapper.insert(channelCustomer);
+        return null;
+    }
+
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
         customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         customer.setStatus(CommConstant.CUSTOMER_REPORT);
@@ -482,7 +521,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setBuildingId(params.getString("intention"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);

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

@@ -0,0 +1,143 @@
+package com.yunzhi.marketing.xlk.controller;
+
+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.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 渠道报备客户表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@RestController
+@RequestMapping("/")
+public class ChannelCustomerController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(ChannelCustomerController.class);
+
+    @Autowired
+    public IChannelCustomerService iChannelCustomerService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channelCustomer",method= RequestMethod.GET)
+    public ResponseBean channelCustomerList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<ChannelCustomer> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<ChannelCustomer> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<ChannelCustomer> result = iChannelCustomerService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param channelCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channelCustomer",method= RequestMethod.POST)
+    public ResponseBean channelCustomerAdd(@RequestBody ChannelCustomer channelCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iChannelCustomerService.save(channelCustomer)){
+                responseBean.addSuccess(channelCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/channelCustomer/{id}", method= RequestMethod.DELETE)
+    public ResponseBean channelCustomerDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iChannelCustomerService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param channelCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channelCustomer/{id}",method= RequestMethod.PUT)
+    public ResponseBean channelCustomerUpdate(@PathVariable Integer id,
+                                        @RequestBody ChannelCustomer channelCustomer){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iChannelCustomerService.updateById(channelCustomer)){
+                responseBean.addSuccess(channelCustomer);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channelCustomer/{id}",method= RequestMethod.GET)
+    public ResponseBean channelCustomerGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iChannelCustomerService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelCustomerDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.yunzhi.marketing.xlk.entity;
+
+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>
+ * 渠道报备客户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_channel_customer")
+public class ChannelCustomer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String channelCustomerId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 昵称
+     */
+    private String name;
+
+    /**
+     * 头像
+     */
+    private String picture;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * personId
+     */
+    private String personId;
+
+    /**
+     * 推荐人 personid
+     */
+    private String recommendPerson;
+
+    /**
+     * 状态 1是审核中 2是审核通过 3是审核不通过
+     */
+    private String status;
+
+    /**
+     * 渠道id
+     */
+    private String channelId;
+
+
+}

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

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 渠道报备客户表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@Mapper
+public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+
+/**
+ * <p>
+ * 渠道报备客户表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+public interface IChannelCustomerService extends IService<ChannelCustomer> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
+import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
+import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 渠道报备客户表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@Service
+public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMapper, ChannelCustomer> implements IChannelCustomerService {
+
+}

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

@@ -0,0 +1,5 @@
+<?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.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper">
+
+</mapper>