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

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

@@ -246,7 +246,7 @@ public class TaRecommendCustomerVO implements Serializable {
     /**
      * 签约
      */
-    private CustomerSignatory customerSignatory;
+    private List<CustomerSignatory> customerSignatory;
 
     /**
      * 认筹

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

@@ -712,8 +712,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             // 签约状态
             LambdaQueryWrapper<CustomerSignatory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(CustomerSignatory::getCustomerId,taRecommendCustomer.getCustomerId());
-            CustomerSignatory customerSignatory = customerSignatoryMapper.selectOne(lambdaQueryWrapper);
-            taRecommendCustomerVO.setCustomerSignatory(customerSignatory);
+            List<CustomerSignatory> customerSignatories = customerSignatoryMapper.selectList(lambdaQueryWrapper);
+            taRecommendCustomerVO.setCustomerSignatory(customerSignatories);
         }
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();

src/main/java/com/yunzhi/marketing/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -219,6 +219,13 @@ public class TaCustomerFollowUpRecordController extends BaseController {
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);
+            List<TaCustomerFollowUpRecord> records = result.getRecords();
+            records.forEach(e -> {
+                TaPerson taPerson = taPersonService.getById(e.getFollowerId());
+                if (null != taPerson) {
+                    e.setFollowerName(taPerson.getName());
+                }
+            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/statistic/entity/TaCustomerFollowUpRecord.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.statistic.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -59,6 +60,12 @@ public class TaCustomerFollowUpRecord implements Serializable {
      * 跟进人ID
      */
     private String followerId;
+
+    /**
+     * 跟进人姓名
+     */
+    @TableField(exist = false)
+    private String followerName;
     
     /**
      * 客户性别

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

@@ -70,7 +70,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         // 保存到访单
         CustomerVisit customerVisit = channelCustomerDTO.getCustomerVisit();
         customerVisit.setBuildingId(customer.getBuildingId());
-        customerVisit.setName(customer.getName());
         customerVisit.setRecommendPerson(customer.getRecommendPerson());
         TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
         if (null != recommendPerson) {
@@ -91,7 +90,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         if (null == recommendCustomer) {
             // 进业务客户表
             TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-            taRecommendCustomer.setName(customer.getName());
+            taRecommendCustomer.setName(customerVisit.getName());
             taRecommendCustomer.setPicture(customer.getPicture());
             taRecommendCustomer.setPhone(customer.getPhone());
             taRecommendCustomer.setSex(customer.getSex());
@@ -113,6 +112,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             customer.setCustomerId(taRecommendCustomer.getCustomerId());
             customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
+            customer.setName(customerVisit.getName());
             channelCustomerMapper.updateById(customer);
         }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                 (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
@@ -122,6 +122,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             customerVisit.setCustomerId(recommendCustomer.getCustomerId());
             customer.setVisitDate(LocalDateTime.now());
             customer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
+            customer.setName(customerVisit.getName());
             channelCustomerMapper.updateById(customer);
             // 修改状态为确认到访状态
             recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
@@ -156,7 +157,6 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             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) {
@@ -177,7 +177,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             if (null == recommendCustomer) {
                 // 进业务客户表
                 TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-                taRecommendCustomer.setName(customer.getName());
+                taRecommendCustomer.setName(customerVisit.getName());
                 taRecommendCustomer.setPicture(customer.getPicture());
                 taRecommendCustomer.setPhone(customer.getPhone());
                 taRecommendCustomer.setSex(customer.getSex());
@@ -200,6 +200,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(taRecommendCustomer.getCustomerId());
                 customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
+                customer.setName(customerVisit.getName());
                 channelCustomerMapper.updateById(customer);
             }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
@@ -208,6 +209,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 customer.setVisitDate(LocalDateTime.now());
                 customer.setCustomerId(recommendCustomer.getCustomerId());
                 customerVisit.setCustomerId(recommendCustomer.getCustomerId());
+                customer.setName(customerVisit.getName());
                 channelCustomerMapper.updateById(customer);
 
                 // 修改状态为确认到访状态
@@ -216,6 +218,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                 recommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
                 recommendCustomer.setCirculationTime(LocalDateTime.now());
+                recommendCustomer.setName(customerVisit.getName());
                 taRecommendCustomerMapper.updateById(recommendCustomer);
             }
         }else if ("customer".equals(params.getType())) {
@@ -301,6 +304,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
         customer.setPreparatoryDate(LocalDateTime.now());
+        channelCustomerMapper.updateById(customer);
 
         CustomerPreparatory customerPreparatory = params.getCustomerPreparatory();
         customerPreparatory.setCreateDate(LocalDateTime.now());
@@ -324,6 +328,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
         customer.setCommissionDate(LocalDateTime.now());
+        channelCustomerMapper.updateById(customer);
 
         return ResponseBean.success("审核成功");
     }
@@ -336,16 +341,19 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
      */
     @Override
     public ResponseBean signatoryCustomer(MarkingSignatoryCustomerDTO params) {
+        CustomerSignatory customerSignatory = params.getCustomerSignatory();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getCustomerId());
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_SIGNED);
+        taRecommendCustomer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
 
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getCustomerId,params.getCustomerId());
         ChannelCustomer customer = channelCustomerMapper.selectOne(channelCustomerLambdaQueryWrapper);
         customer.setSignedDate(LocalDateTime.now());
+        customer.setRealtyConsultant(customerSignatory.getRealtyConsultant());
+        channelCustomerMapper.updateById(customer);
 
-        CustomerSignatory customerSignatory = params.getCustomerSignatory();
         customerSignatory.setCreateDate(LocalDateTime.now());
         customerSignatoryMapper.insert(customerSignatory);
         return ResponseBean.success("审核成功");