Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

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

@@ -9,6 +9,7 @@ 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.ChannelCustomer;
 import com.yunzhi.marketing.xlk.entity.CustomerPreparatory;
 import com.yunzhi.marketing.xlk.entity.CustomerSignatory;
 import com.yunzhi.marketing.xlk.entity.CustomerVisit;
@@ -199,7 +200,7 @@ public class TaRecommendCustomerVO implements Serializable {
 
     @TableField(exist = false)
     private List<PersonIntention> intentions;
-    
+
     @TableField(exist = false)
     private String intentionName;
 
@@ -251,4 +252,9 @@ public class TaRecommendCustomerVO implements Serializable {
      * 认筹
      */
     private CustomerPreparatory customerPreparatory;
+
+    /**
+     * 渠道客户
+     */
+    private ChannelCustomer channelCustomer;
 }

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

@@ -716,6 +716,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taRecommendCustomerVO.setCustomerSignatory(customerSignatory);
         }
 
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,id);
+        ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
+        if (null != customer) {
+            taRecommendCustomerVO.setChannelCustomer(customer);
+        }
         return ResponseBean.success(taRecommendCustomerVO);
     }
 

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

@@ -104,7 +104,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setOrgId(customer.getOrgId());
             taRecommendCustomer.setPersonId(customer.getPersonId());
             taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+            taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
             taRecommendCustomer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             taRecommendCustomerMapper.insert(taRecommendCustomer);
@@ -123,6 +123,13 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             customer.setVisitDate(LocalDateTime.now());
             customer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
             channelCustomerMapper.updateById(customer);
+            // 修改状态为确认到访状态
+            recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
+            recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+            recommendCustomer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
+            recommendCustomer.setCirculationTime(LocalDateTime.now());
+            taRecommendCustomerMapper.updateById(recommendCustomer);
         }else {
             return ResponseBean.error("此客户是私客或已被报备", ResponseBean.ERROR_UNAVAILABLE);
         }