bug

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

@@ -38,4 +38,6 @@ public class ChannelReportDTO {
      * 性别
      */
     private Integer sex;
+
+    private String remark;
 }

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

@@ -432,6 +432,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setStatus("1");
         channelCustomer.setChannelId(taChannelPeople.getChannelId());
         channelCustomer.setOrgId(channelReportDTO.getOrgId());
+        channelCustomer.setRemark(channelReportDTO.getRemark());
         channelCustomerMapper.insert(channelCustomer);
         return ResponseBean.success(channelCustomer);
     }

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

@@ -179,7 +179,7 @@ public class ChannelCustomerController extends BaseController {
             if (StringUtils.isEmpty(channelCustomer.getCustomerId())){
                 return ResponseBean.success(channelCustomer);
             }
-            responseBean.addSuccess(taRecommendCustomerService.getCustDetail(channelCustomer.getCustomerId()));
+            responseBean = taRecommendCustomerService.getCustDetail(channelCustomer.getCustomerId());
         }catch (Exception e){
             e.printStackTrace();
             logger.error("channelCustomerDelete -=- {}",e.toString());

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

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class CustomerPreparatory implements Serializable {
     /**
      * 客户认筹id
      */
+    @TableId(type = IdType.UUID)
     private String customerPreparatoryId;
 
     /**

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

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class CustomerSignatory implements Serializable {
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private String customerSignatoryId;
 
     /**

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

@@ -1,5 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,6 +29,7 @@ public class CustomerVisit implements Serializable {
     /**
      * 客户到访id
      */
+    @TableId(type = IdType.UUID)
     private String customerVisitId;
 
     /**

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

@@ -7,7 +7,9 @@ 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.TaPerson;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.mapper.TaPersonMapper;
 import com.yunzhi.marketing.mapper.TaRecommendCustomerMapper;
 import com.yunzhi.marketing.po.MineRecommendCustomerPO;
 import com.yunzhi.marketing.po.TaRecommendCustomerPO;
@@ -45,6 +47,9 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
     @Autowired
     private CustomerSignatoryMapper customerSignatoryMapper;
+
+    @Autowired
+    private TaPersonMapper taPersonMapper;
     /**
      * 审核
      *
@@ -64,8 +69,19 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
         // 保存到访单
         CustomerVisit customerVisit = channelCustomerDTO.getCustomerVisit();
-        customerVisit.setCreateDate(LocalDateTime.now());
-        customerVisitMapper.insert(customerVisit);
+        customerVisit.setBuildingId(customer.getBuildingId());
+        customerVisit.setName(customer.getName());
+        customerVisit.setRecommendPerson(customer.getRecommendPerson());
+        TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+        if (null != recommendPerson) {
+            customerVisit.setRealtyConsultantName(recommendPerson.getName());
+        }
+        customerVisit.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
+        TaPerson channelPerson = taPersonMapper.getById(channelCustomerDTO.getRealtyConsultant());
+        if (null != channelPerson) {
+            customerVisit.setRealtyConsultantName(channelPerson.getName());
+        }
+        customerVisit.setOrgId(customer.getOrgId());
 
         // 审核通过 先查看在ta_recommend_customer 手机号是否存在
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
@@ -95,22 +111,27 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             // 审核通过
             customer.setStatus("2");
             customer.setCustomerId(taRecommendCustomer.getCustomerId());
+            customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
             channelCustomerMapper.updateById(customer);
-            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");
             customer.setCustomerId(recommendCustomer.getCustomerId());
+            customerVisit.setCustomerId(recommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
+            customer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             channelCustomerMapper.updateById(customer);
-            return ResponseBean.success("审核成功");
+        }else {
+            return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
+
+        customerVisit.setCreateDate(LocalDateTime.now());
+        customerVisitMapper.insert(customerVisit);
+
+        return ResponseBean.success("审核成功");
     }
 
     /**
@@ -122,9 +143,25 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
      */
     @Override
     public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
+        CustomerVisit customerVisit = params.getCustomerVisit();
         // 渠道推荐的客户
         if ("report".equals(params.getType())) {
             ChannelCustomer customer = channelCustomerMapper.selectById(params.getId());
+
+            customerVisit.setBuildingId(customer.getBuildingId());
+            customerVisit.setName(customer.getName());
+            customerVisit.setRecommendPerson(customer.getRecommendPerson());
+            TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
+            if (null != recommendPerson) {
+                customerVisit.setRealtyConsultantName(recommendPerson.getName());
+            }
+            customerVisit.setRealtyConsultant(params.getRealtyConsultant());
+            TaPerson channelPerson = taPersonMapper.getById(params.getRealtyConsultant());
+            if (null != channelPerson) {
+                customerVisit.setRealtyConsultantName(channelPerson.getName());
+            }
+            customerVisit.setOrgId(customer.getOrgId());
+
             // 审核通过 先查看在ta_recommend_customer 手机号是否存在
             LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(TaRecommendCustomer::getPhone,customer.getPhone());
@@ -155,6 +192,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 customer.setStatus("2");
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(taRecommendCustomer.getCustomerId());
+                customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
                 channelCustomerMapper.updateById(customer);
             }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
@@ -162,6 +200,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 customer.setStatus("2");
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(recommendCustomer.getCustomerId());
+                customerVisit.setCustomerId(recommendCustomer.getCustomerId());
                 channelCustomerMapper.updateById(customer);
 
                 // 修改状态为确认到访状态
@@ -178,13 +217,13 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
+            customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             taRecommendCustomerMapper.updateById(taRecommendCustomer);
         }else {
             return ResponseBean.error("请输入正确的类型参数", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 保存到访单
-        CustomerVisit customerVisit = params.getCustomerVisit();
         customerVisit.setCreateDate(LocalDateTime.now());
         customerVisitMapper.insert(customerVisit);