驻场

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -268,6 +268,11 @@ public class CommConstant {
      * 报备
      * */
     public static final String ENTRY_VERIFY = "verify";
+
+    /**
+     * 渠道报备
+     */
+    public static final String ENTRY_CHANNEL_VERIFY = "channel_verify";
     //=================  客户入口类型 end =======================
 
     /**

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

@@ -52,7 +52,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "项目类型", tags = "项目类型")
+@Api(value = "xlk - 项目类型", tags = "xlk - 项目类型")
 public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
@@ -82,8 +82,6 @@ public class TaRecommendCustomerController extends BaseController {
     @Autowired
     private ITaUserService iTaUserService;
 
-
-
     /**
      * 驻场的客户列表
      *
@@ -94,7 +92,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/marking/customers")
-    @ApiOperation(value = "查询驻场的客户列表", notes = "查询驻场的客户列表")
+    @ApiOperation(value = "wx-查询驻场的客户列表", notes = "wx-查询驻场的客户列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),

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

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.entity.TaPersonBuilding;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.marketing.excel.*;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -302,4 +303,13 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     Map<String, Number> checkCustomerBy(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("consultBuildingIds") List<String> consultBuildingIds, @Param("buildingId") String buildingId);
+
+    /**
+     * 驻场客户列表
+     * @param page
+     * @param keywords
+     * @param buildingId
+     * @return
+     */
+    IPage<TaRecommendCustomerPO> getMarkingCustList(IPage<TaRecommendCustomerPO> page,@Param("keywords") String keywords,@Param("buildingId") String buildingId);
 }

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -0,0 +1,19 @@
+package com.yunzhi.marketing.po;
+
+import lombok.Data;
+
+@Data
+public class TaRecommendCustomerPO {
+
+    private String id;
+
+    private String name;
+
+    private String phone;
+
+    private String picture;
+
+    private String sex;
+
+    private String type;
+}

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

@@ -19,6 +19,7 @@ import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
 import com.yunzhi.marketing.excel.ReporRecommendCustomer;
+import com.yunzhi.marketing.po.TaRecommendCustomerPO;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -443,14 +444,20 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-
         TaPerson taPerson = taPersons.get(0);
 
-        IPage<TaRecommendCustomer> page = new Page<>();
-        page.setCurrent(pageNumber);
-        page.setSize(pageSize);
+        // 验证当前人员是否是驻场顾问
+        LambdaQueryWrapper<TaPersonBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,taPerson.getPersonId());
+        lambdaQueryWrapper.eq(TaPersonBuilding::getBuildingId,buildingId);
+        TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(lambdaQueryWrapper);
+        if (null == taPersonBuilding) {
+            return ResponseBean.error("你不是此楼盘的驻场顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.selectPage(page, null);
+        // 查询出此楼盘下的职业顾问
+        IPage<TaRecommendCustomerPO> page = new Page<>(pageNumber,pageSize);
+        IPage<TaRecommendCustomerPO> result = taRecommendCustomerMapper.getMarkingCustList(page, keywords,buildingId);
         return ResponseBean.success(result);
     }
 

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

@@ -7,6 +7,7 @@ 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.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import io.swagger.annotations.Api;
@@ -76,6 +77,19 @@ public class ChannelCustomerController extends BaseController {
         return iChannelCustomerService.auditCustomer(id,channelCustomerDTO);
     }
 
+
+    /**
+     * 驻场 确认到访
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "wx-驻场确认到访", notes = "wx-驻场确认到访")
+    @RequestMapping(value="/wx/marking/channelCustomer",method= RequestMethod.PUT)
+    public ResponseBean channelCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
+        return iChannelCustomerService.markingChannelCustomer(params);
+    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

src/main/java/com/yunzhi/marketing/xlk/dto/MarkingChannelCustomerDTO.java

@@ -0,0 +1,30 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 渠道报备客户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_channel_customer")
+public class MarkingChannelCustomerDTO implements Serializable {
+
+    private String id;
+    /**
+     * customer / channel  一个代表业务客户 一个代表渠道推荐客户
+     */
+   private String type;
+
+}

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

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 
 /**
@@ -22,4 +23,12 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @return
      */
     ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO);
+
+    /**
+     * 驻场确认到访
+     * @param id
+     * @param params
+     * @return
+     */
+    ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params);
 }

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

@@ -3,17 +3,19 @@ package com.yunzhi.marketing.xlk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
 import com.yunzhi.marketing.xlk.dto.ChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -53,16 +55,33 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
-        if (null == taRecommendCustomer) {
+        TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+        if (null == recommendCustomer) {
             // 审核通过
             customer.setStatus("2");
             channelCustomerMapper.updateById(customer);
+            // 进业务客户表
+            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+            taRecommendCustomer.setName(customer.getName());
+            taRecommendCustomer.setPicture(customer.getPicture());
+            taRecommendCustomer.setPhone(customer.getPhone());
+            taRecommendCustomer.setSex(customer.getSex());
+            taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+            taRecommendCustomer.setBuildingId(customer.getBuildingId());
+            taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            taRecommendCustomer.setCreateDate(LocalDateTime.now());
+            taRecommendCustomer.setReportDate(LocalDateTime.now());
+            taRecommendCustomer.setOrgId(customer.getOrgId());
+            taRecommendCustomer.setPersonId(customer.getPersonId());
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+            taRecommendCustomerMapper.insert(taRecommendCustomer);
             return ResponseBean.success("审核成功");
         }
 
-        if (StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant()) &&
-                (StringUtils.isEmpty(taRecommendCustomer.getRecommendPerson()) || taRecommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
+        if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+                (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
             // 审核通过
             customer.setStatus("2");
             channelCustomerMapper.updateById(customer);
@@ -71,4 +90,70 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
         return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
     }
+
+    /**
+     * 驻场确认到访
+     *
+     * @param id
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
+        // 渠道推荐的客户
+        if ("channel".equals(params.getType())) {
+            ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+            // 审核通过 先查看在ta_recommend_customer 手机号是否存在
+            LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
+            queryWrapper.eq(TaRecommendCustomer::getBuildingId,customer.getBuildingId());
+            TaRecommendCustomer recommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
+            if (null == recommendCustomer) {
+                // 审核通过
+                customer.setStatus("2");
+                channelCustomerMapper.updateById(customer);
+                // 进业务客户表
+                TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+                taRecommendCustomer.setName(customer.getName());
+                taRecommendCustomer.setPicture(customer.getPicture());
+                taRecommendCustomer.setPhone(customer.getPhone());
+                taRecommendCustomer.setSex(customer.getSex());
+                taRecommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+                taRecommendCustomer.setBuildingId(customer.getBuildingId());
+                taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+                taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                taRecommendCustomer.setCreateDate(LocalDateTime.now());
+                taRecommendCustomer.setReportDate(LocalDateTime.now());
+                taRecommendCustomer.setOrgId(customer.getOrgId());
+                taRecommendCustomer.setPersonId(customer.getPersonId());
+                taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+                taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomerMapper.insert(taRecommendCustomer);
+                return ResponseBean.success("审核成功");
+            }
+
+            if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+                    (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
+                // 审核通过
+                customer.setStatus("2");
+                channelCustomerMapper.updateById(customer);
+
+                // 修改状态为确认到访状态
+                recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+                recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomerMapper.updateById(recommendCustomer);
+                return ResponseBean.success("审核成功");
+            }
+        }else if ("customer".equals(params.getType())) {
+            // 置业顾问 经纪人推荐的客户
+            TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getId());
+            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+            taRecommendCustomerMapper.updateById(taRecommendCustomer);
+            return ResponseBean.success("审核成功");
+        }
+
+        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+    }
 }

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -942,4 +942,35 @@ FROM
             AND t.person_id = #{personId}
             AND t.status > -1
     </select>
+    <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
+        SELECT
+            customer_id AS id,
+            name,
+            phone,
+            picture,
+            sex,
+            "customer" AS type
+        FROM
+            ta_recommend_customer
+        WHERE
+            building_id = #{buildingId}
+        <if test="keywords != null and keywords !=''">
+            and name like CONCAT('%',#{keywords}, '%')
+        </if>
+    UNION ALL
+        SELECT
+            channel_customer_id AS id,
+            NAME,
+            phone,
+            picture,
+            sex,
+            "channel" AS type
+        FROM
+            xlk_channel_customer
+        WHERE
+            building_id = #{buildingId}
+        <if test="keywords != null and keywords !=''">
+            and name like CONCAT('%',#{keywords}, '%')
+        </if>
+    </select>
 </mapper>