11

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

@@ -234,15 +234,20 @@ public class CommConstant {
      */
     public static final Integer CUSTOMER_VISITE = 2;
 
+    /**
+     * 客户认筹
+     */
+    public static final Integer CUSTOMER_PREPARATORY = 3;
+
     /**
      * 客户认购
      */
-    public static final Integer CUSTOMER_PREORDER = 3;
+    public static final Integer CUSTOMER_PREORDER = 4;
 
     /**
      * 客户签约
      */
-    public static final Integer CUSTOMER_SIGNED = 4;
+    public static final Integer CUSTOMER_SIGNED = 5;
 
 
     /**

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

@@ -0,0 +1,260 @@
+package com.yunzhi.marketing.po;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.entity.PersonIntention;
+import com.yunzhi.marketing.entity.TaPersonVisitRecord;
+import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
+import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
+import com.yunzhi.marketing.xlk.entity.CustomerVisit;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 推荐客户表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRecommendCustomerVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @TableId(value = "customer_id", type = IdType.UUID)
+    private String customerId;
+
+    /**
+     * 姓名
+     */
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 照片
+     */
+    private String picture;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "`describe`")
+    private String describe;
+
+    /**
+     * 预约时间
+     */
+    private LocalDateTime appointmentTime;
+
+    /**
+     * 到访人数
+     */
+    private Integer visiteNum;
+
+    /**
+     * 意向项目
+     */
+    @ExcelProperty(value = "意向项目", index = 3)
+    private String intention;
+
+    /**
+     * 项目ID
+     */
+    private String buildingId;
+
+    /**
+     * 物业类型
+     */
+    private String realtyManageType;
+
+    /**
+     * 需求类型
+     */
+    private String demandType;
+
+    /**
+     * 价格区间
+     */
+    private String priceRange;
+
+    /**
+     * 报备日期
+     */
+    private LocalDateTime reportDate;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "`status`")
+    private Integer status;
+
+    /**
+     * 推荐人
+     */
+    private String recommendPerson;
+
+    private String personId;
+
+    /**
+     * 服务顾问
+     */
+    private String realtyConsultant;
+
+    /**
+     * 服务顾问
+     */
+    @TableField(exist = false)
+    private Map<String, Object> consultants;
+
+    @TableField(exist = false)
+    private String consultantName;
+
+    @TableField(exist = false)
+    private String consultTel;
+
+    private Integer verifyStatus;
+
+    private String verifyRemark;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String entryType;
+
+    private LocalDateTime arrivalDate;
+
+    private LocalDateTime verifyDate;
+
+    /**
+     * 流转使劲
+     */
+    private LocalDateTime circulationTime;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionId;
+
+    @DateTimeFormat("yyyy年MM月dd日")
+    private LocalDateTime createDate;
+
+    private Integer reportRecommendStatus;
+
+    private Integer orgId;
+
+    @TableField(exist = false)
+    private IPage<TaPersonVisitRecord> visitRecords;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    @TableField(exist = false)
+    private Integer duration;
+
+    @TableField(exist = false)
+    private LocalDateTime visitTime;
+
+    @TableField(exist = false)
+    private Integer visitTimes;
+
+    @TableField(exist = false)
+    private TaUser consultant;
+
+    @TableField(exist = false)
+    private String recommendName;
+
+    @TableField(exist = false)
+    private String recommendTel;
+
+    @TableField(exist = false)
+    private List<PersonIntention> intentions;
+    
+    @TableField(exist = false)
+    private String intentionName;
+
+
+    /**
+     * 推广人
+     */
+    @TableField(exist = false)
+    private String sharePersonName;
+
+    @TableField(exist = false)
+    private Map<String,String> geoInfo;
+
+    @TableField(exist = false)
+    private String avatarurl;
+
+    /**
+     * 所属项目
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
+    /**
+     * 来源类型
+     */
+    private String personFrom;
+
+    /**
+     * 迁移人的名称
+     */
+    private String moveUserName;
+
+    /**
+     * 迁移人的userId
+     */
+    private String moveUserId;
+
+    /**
+     * 到访
+     */
+    private CustomerVisit customerVisit;
+
+    /**
+     * 认购
+     */
+    private CustomerSubscribe customerSubscribe;
+
+    /**
+     * 签约
+     */
+    private CustomerSignatory customerSignatory;
+
+    /**
+     * 认筹
+     */
+    private CustomerPreparatory customerPreparatory;
+}

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

@@ -21,6 +21,7 @@ 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.po.TaRecommendCustomerVO;
 import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,13 +29,12 @@ 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.BuildingChannel;
-import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
-import com.yunzhi.marketing.xlk.mapper.BuildingChannelMapper;
-import com.yunzhi.marketing.xlk.mapper.ChannelCustomerMapper;
+import com.yunzhi.marketing.xlk.entity.*;
+import com.yunzhi.marketing.xlk.mapper.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.beans.BeanCopier;
 import org.springframework.stereotype.Service;
@@ -128,6 +128,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaChannelPersonMapper channelPersonMapper;
 
+    @Autowired
+    private CustomerVisitMapper customerVisitMapper;
+
+    @Autowired
+    private CustomerPreparatoryMapper customerPreparatoryMapper;
+
+    @Autowired
+    private CustomerSignatoryMapper customerSignatoryMapper;
+
+    @Autowired
+    private CustomerSubscribeMapper customerSubscribeMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -656,6 +668,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
 
+        // 兼容渠道报备客户
+        if (null == taRecommendCustomer) {
+            ChannelCustomer customer = channelCustomerMapper.selectById(id);
+            BeanUtils.copyProperties(customer,taRecommendCustomer);
+        }
+
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
             if (null != taPerson) {
@@ -668,7 +686,43 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             }
         }
 
-        return ResponseBean.success(taRecommendCustomer);
+        TaRecommendCustomerVO taRecommendCustomerVO = new TaRecommendCustomerVO();
+        BeanUtils.copyProperties(taRecommendCustomer,taRecommendCustomerVO);
+        // 根据不同的状态值去返回不用的数据集合
+        if (CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getStatus())) {
+            // 报备状态
+            String recommendPerson = taRecommendCustomer.getRecommendPerson();
+            TaPerson taPerson = taPersonMapper.selectById(recommendPerson);
+            if (null != taPerson) {
+                taRecommendCustomer.setRecommendName(taPerson.getName());
+            }
+        }else if (CommConstant.CUSTOMER_VISITE.equals(taRecommendCustomer.getStatus())) {
+            // 到访状态
+            LambdaQueryWrapper<CustomerVisit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerVisit::getCustomerId,taRecommendCustomer.getCustomerId());
+            CustomerVisit customerVisit = customerVisitMapper.selectOne(lambdaQueryWrapper);
+            taRecommendCustomerVO.setCustomerVisit(customerVisit);
+        }else if (CommConstant.CUSTOMER_PREPARATORY.equals(taRecommendCustomer.getStatus())) {
+            // 认筹状态
+            LambdaQueryWrapper<CustomerPreparatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerPreparatory::getCustomerId,taRecommendCustomer.getCustomerId());
+            CustomerPreparatory customerPreparatory = customerPreparatoryMapper.selectOne(lambdaQueryWrapper);
+            taRecommendCustomerVO.setCustomerPreparatory(customerPreparatory);
+        }else if (CommConstant.CUSTOMER_PREORDER.equals(taRecommendCustomer.getStatus())) {
+            // 认购状态
+            LambdaQueryWrapper<CustomerSubscribe> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerSubscribe::getCustomerId,taRecommendCustomer.getCustomerId());
+            CustomerSubscribe customerSubscribe = customerSubscribeMapper.selectOne(lambdaQueryWrapper);
+            taRecommendCustomerVO.setCustomerSubscribe(customerSubscribe);
+        }else if (CommConstant.CUSTOMER_SIGNED.equals(taRecommendCustomer.getStatus())) {
+            // 签约状态
+            LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
+            CustomerSignatory customerSignatory = customerSignatoryMapper.selectOne(lambdaQueryWrapper);
+            taRecommendCustomerVO.setCustomerSignatory(customerSignatory);
+        }
+
+        return ResponseBean.success(taRecommendCustomerVO);
     }
 
     @Override

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

@@ -6,8 +6,7 @@ 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.dto.ChannelCustomerDTO;
-import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import io.swagger.annotations.Api;
@@ -100,11 +99,47 @@ public class ChannelCustomerController extends BaseController {
      * @return
      */
     @ApiOperation(value = "森哥看这里-wx-驻场确认到访", notes = "森哥看这里-wx-驻场确认到访")
-    @RequestMapping(value="/wx/marking/channelCustomer",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/marking/visit",method= RequestMethod.PUT)
     public ResponseBean channelCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
         return iChannelCustomerService.markingChannelCustomer(params);
     }
 
+    /**
+     * 驻场 确认认筹
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "森哥看这里-wx-驻场确认认筹", notes = "森哥看这里-wx-驻场确认认筹")
+    @RequestMapping(value="/wx/marking/preparatory",method= RequestMethod.PUT)
+    public ResponseBean preparatoryCustomer(@RequestBody MarkingPreparatoryCustomerDTO params){
+        return iChannelCustomerService.preparatoryCustomer(params);
+    }
+
+    /**
+     * 驻场 确认认购
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "森哥看这里-wx-驻场确认认购", notes = "森哥看这里-wx-驻场确认认购")
+    @RequestMapping(value="/wx/marking/subscribe",method= RequestMethod.PUT)
+    public ResponseBean subscribeCustomer(@RequestBody MarkingSubscribeCustomerDTO params){
+        return iChannelCustomerService.subscribeCustomer(params);
+    }
+
+    /**
+     * 驻场 确认签约
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "森哥看这里-wx-驻场确认签约", notes = "森哥看这里-wx-驻场确认签约")
+    @RequestMapping(value="/wx/marking/signatory",method= RequestMethod.PUT)
+    public ResponseBean signatoryCustomer(@RequestBody MarkingSignatoryCustomerDTO params){
+        return iChannelCustomerService.signatoryCustomer(params);
+    }
+
 
     /**
      * 驻场 无效报备

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

@@ -91,6 +91,26 @@ public class CustomerInfoController extends BaseController {
         }
         TaPerson person = persons.get(0);
         try {
+            LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerInfo.getCustomerId());
+            CustomerInfo oldCustomerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
+            if (null != oldCustomerInfo) {
+                if (iCustomerInfoService.updateById(customerInfo)){
+                    // 记录到修改记录表中
+                    CustomerInfoModifyRecord customerInfoModifyRecord = new CustomerInfoModifyRecord();
+                    customerInfoModifyRecord.setCreateDate(LocalDateTime.now());
+                    customerInfoModifyRecord.setCustomerInfoId(oldCustomerInfo.getCustomerId());
+                    customerInfoModifyRecord.setModifyPersonId(person.getPersonId());
+                    customerInfoModifyRecord.setOrgId(orgId);
+                    customerInfoModifyRecord.setContent(JSONObject.toJSONString(customerInfo));
+                    customerInfoModifyRecordService.save(customerInfoModifyRecord);
+                    responseBean.addSuccess(customerInfo);
+                }else {
+                    responseBean.addError("fail");
+                }
+                return responseBean;
+            }
+
             customerInfo.setCreateDate(LocalDateTime.now());
             customerInfo.setCreatePerson(person.getPersonId());
             customerInfo.setOrgId(orgId);
@@ -131,12 +151,12 @@ public class CustomerInfoController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     * @param customerId  实体ID
      * @param customerInfo 实体对象
      * @return
      */
-    @RequestMapping(value="/customerInfo/{id}",method= RequestMethod.PUT)
-    public ResponseBean customerInfoUpdate(@PathVariable String id,
+    @RequestMapping(value="/wx/customerInfo/{customerId}",method= RequestMethod.PUT)
+    public ResponseBean customerInfoUpdate(@PathVariable String customerId,
                                         @RequestBody CustomerInfo customerInfo, @RequestHeader("authorization") String token,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -147,12 +167,14 @@ public class CustomerInfoController extends BaseController {
         }
         TaPerson person = persons.get(0);
         try {
-            customerInfo.setCustomerInfoId(id);
+            LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
+            CustomerInfo oldCustomerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
             if (iCustomerInfoService.updateById(customerInfo)){
                 // 记录到修改记录表中
                 CustomerInfoModifyRecord customerInfoModifyRecord = new CustomerInfoModifyRecord();
                 customerInfoModifyRecord.setCreateDate(LocalDateTime.now());
-                customerInfoModifyRecord.setCustomerInfoId(id);
+                customerInfoModifyRecord.setCustomerInfoId(oldCustomerInfo.getCustomerId());
                 customerInfoModifyRecord.setModifyPersonId(person.getPersonId());
                 customerInfoModifyRecord.setOrgId(orgId);
                 customerInfoModifyRecord.setContent(JSONObject.toJSONString(customerInfo));

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.xlk.entity.CustomerVisit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -32,4 +33,8 @@ public class MarkingChannelCustomerDTO implements Serializable {
      */
    private String realtyConsultant;
 
+    /**
+     * 到访
+     */
+   private CustomerVisit customerVisit;
 }

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

@@ -0,0 +1,31 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
+import com.yunzhi.marketing.xlk.entity.CustomerVisit;
+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)
+public class MarkingPreparatoryCustomerDTO implements Serializable {
+
+    private String customerId;
+
+    /**
+     * 认筹
+     */
+   private CustomerPreparatory customerPreparatory;
+}

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

@@ -0,0 +1,30 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
+import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
+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)
+public class MarkingSignatoryCustomerDTO implements Serializable {
+
+    private String customerId;
+
+    /**
+     * 认筹
+     */
+   private CustomerSignatory customerSignatory;
+}

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

@@ -0,0 +1,30 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
+import com.yunzhi.marketing.xlk.entity.CustomerSubscribe;
+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)
+public class MarkingSubscribeCustomerDTO implements Serializable {
+
+    private String customerId;
+
+    /**
+     * 认筹
+     */
+   private CustomerSubscribe customerSubscribe;
+}

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

@@ -34,6 +34,11 @@ public class CustomerPreparatory implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
     /**
      * 客户姓名
      */

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

@@ -34,6 +34,11 @@ public class CustomerSignatory implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
     /**
      * 客户姓名
      */

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

@@ -34,6 +34,11 @@ public class CustomerSubscribe implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
     /**
      * 客户姓名
      */

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

@@ -34,6 +34,11 @@ public class CustomerVisit implements Serializable {
      */
     private String customerId;
 
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
     /**
      * 客户姓名
      */

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

@@ -3,8 +3,7 @@ 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;
-import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
+import com.yunzhi.marketing.xlk.dto.*;
 import com.yunzhi.marketing.xlk.entity.ChannelCustomer;
 
 /**
@@ -49,4 +48,25 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
                                           String recommendPhone,
                                           String status,
                                           String type);
+
+    /**
+     * 驻场认筹
+     * @param params
+     * @return
+     */
+    ResponseBean preparatoryCustomer(MarkingPreparatoryCustomerDTO params);
+
+    /**
+     * 驻场认购
+     * @param params
+     * @return
+     */
+    ResponseBean subscribeCustomer(MarkingSubscribeCustomerDTO params);
+
+    /**
+     * 驻场签约
+     * @param params
+     * @return
+     */
+    ResponseBean signatoryCustomer(MarkingSignatoryCustomerDTO params);
 }

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

@@ -8,10 +8,9 @@ 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.dto.*;
+import com.yunzhi.marketing.xlk.entity.*;
+import com.yunzhi.marketing.xlk.mapper.*;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +34,18 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
     @Autowired
     private TaRecommendCustomerMapper taRecommendCustomerMapper;
 
+    @Autowired
+    private CustomerVisitMapper customerVisitMapper;
+
+    @Autowired
+    private CustomerPreparatoryMapper customerPreparatoryMapper;
+
+    @Autowired
+    private CustomerSignatoryMapper customerSignatoryMapper;
+
+    @Autowired
+    private CustomerSubscribeMapper customerSubscribeMapper;
+
     /**
      * 审核
      *
@@ -134,10 +145,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
                 taRecommendCustomer.setCirculationTime(LocalDateTime.now());
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
-                return ResponseBean.success("审核成功");
-            }
-
-            if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+            }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
                 // 审核通过
                 customer.setStatus("2");
@@ -150,7 +158,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 recommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
                 recommendCustomer.setCirculationTime(LocalDateTime.now());
                 taRecommendCustomerMapper.updateById(recommendCustomer);
-                return ResponseBean.success("审核成功");
             }
         }else if ("customer".equals(params.getType())) {
             // 置业顾问 经纪人推荐的客户
@@ -159,10 +166,16 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             taRecommendCustomerMapper.updateById(taRecommendCustomer);
-            return ResponseBean.success("审核成功");
+        }else {
+            return ResponseBean.error("请输入正确的类型参数", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+        // 保存到访单
+        CustomerVisit customerVisit = params.getCustomerVisit();
+        customerVisit.setCreateDate(LocalDateTime.now());
+        customerVisitMapper.insert(customerVisit);
+
+        return ResponseBean.success("审核成功");
     }
 
     /**
@@ -212,4 +225,58 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                                                  String status,String type) {
         return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status, type);
     }
+
+    /**
+     * 驻场认筹
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean preparatoryCustomer(MarkingPreparatoryCustomerDTO params) {
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_PREPARATORY);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+
+        CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
+        customerPreparatory.setCreateDate(LocalDateTime.now());
+        customerPreparatoryMapper.insert(customerPreparatory);
+        return ResponseBean.success("审核成功");
+    }
+
+    /**
+     * 驻场认购
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean subscribeCustomer(MarkingSubscribeCustomerDTO params) {
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_PREORDER);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+
+        CustomerSubscribe customerSubscribe = params.getCustomerSubscribe();
+        customerSubscribe.setCreateDate(LocalDateTime.now());
+        customerSubscribeMapper.insert(customerSubscribe);
+        return ResponseBean.success("审核成功");
+    }
+
+    /**
+     * 驻场签约
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean signatoryCustomer(MarkingSignatoryCustomerDTO params) {
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_SIGNED);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+
+        CustomerSignatory customerSignatory = params.getCustomerSignatory();
+        customerSignatory.setCreateDate(LocalDateTime.now());
+        customerSignatoryMapper.insert(customerSignatory);
+        return ResponseBean.success("审核成功");
+    }
 }