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

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

 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.dto.AverageReportDTO;
 import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
         return taRecommendCustomerService.channelReportCust(channelReportDTO);
     }
 
+    /**
+     * 普通客户报备客户
+     *
+     * @param averageReportDTO
+     * @param request
+     * @return
+     */
+    @PostMapping("/wx/average/report")
+    @ApiOperation(value = "wx-普通客户报备客户", notes = "森哥看这里-wx-普通客户报备客户")
+    public ResponseBean averageReportCust(@RequestBody AverageReportDTO averageReportDTO, HttpServletRequest request) throws Exception {
+        String personId = getPersonId(request);
+        Integer orgId = getOrgId(request);
+        averageReportDTO.setPersonId(personId);
+        averageReportDTO.setOrgId(orgId);
+        return taRecommendCustomerService.averageReportCust(averageReportDTO);
+    }
+
 
     /**
      * 置业顾问报备客户
      * @param request
      * @return
      */
+    @ApiOperation(value = "wx-置业顾问手动报备客户", notes = "森哥看这里-wx-置业顾问手动报备客户")
     @PostMapping("/wx/customer/manualReport")
     public ResponseBean manualReport(@RequestBody ChannelReportDTO reportCust, HttpServletRequest request) {
         Integer orgId = getOrgId(request);

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

+package com.yunzhi.marketing.dto;
+
+import lombok.Data;
+
+@Data
+public class AverageReportDTO {
+
+    private String personId;
+
+    private Integer orgId;
+
+    /**
+     * 电话号码
+     */
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 图片
+     */
+    private String picture;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+}

src/main/java/com/yunzhi/marketing/entity/TaRecommendCustomer.java

 
     private LocalDateTime verifyDate;
 
+    /**
+     * 流转使劲
+     */
+    private LocalDateTime circulationTime;
+
     /**
      * 组织结构id
      */

src/main/java/com/yunzhi/marketing/job/CustomerTimeJob.java

+package com.yunzhi.marketing.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.service.ITaRecommendCustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class CustomerTimeJob {
+
+    @Autowired
+    private ITaRecommendCustomerService taRecommendCustomerService;
+
+    //    @Scheduled(cron = "* 0/1 * * * ?")
+    private void customerTimeJob() {
+        LocalDateTime nowDate = LocalDateTime.now();
+        LocalDateTime beforeTime = nowDate.plusDays(-15);
+        LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.between(TaRecommendCustomer::getCirculationTime,beforeTime,nowDate);
+        queryWrapper.eq(TaRecommendCustomer::getVerifyStatus, CommConstant.VERIFY_AGREE);
+        List<TaRecommendCustomer> list = taRecommendCustomerService.list(queryWrapper);
+        list.forEach(e -> {
+            e.setBuildingId(null);
+            e.setRealtyConsultant(null);
+            e.setRecommendPerson(null);
+        });
+        taRecommendCustomerService.updateBatchById(list);
+    }
+}

src/main/java/com/yunzhi/marketing/service/ITaRecommendCustomerService.java

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.dto.AverageReportDTO;
 import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
     ResponseBean getMarkingCustList(String openid, String keywords, int pageNumber, int pageSize, String buildingId);
 
     void manualReport(Integer orgId, TaPerson consultant, ChannelReportDTO reportCust) throws Exception;
+
+    /**
+     * 普通客户报备客户
+     * @param averageReportDTO
+     * @return
+     */
+    ResponseBean averageReportCust(AverageReportDTO averageReportDTO);
 }

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

 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.drainage.entity.TaDrainage;
 import com.yunzhi.marketing.drainage.mapper.TaDrainageMapper;
+import com.yunzhi.marketing.dto.AverageReportDTO;
 import com.yunzhi.marketing.dto.ChannelReportDTO;
 import com.yunzhi.marketing.excel.AgentsRecommendCustomer;
 import com.yunzhi.marketing.excel.ExcelRecommendCustomer;
             recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             recommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
             recommendCustomer.setRecommendPerson(consultant.getPersonId());
+            recommendCustomer.setCirculationTime(LocalDateTime.now());
             customerFrom.setIsProjectFirst(true);
             customerFrom.setIsOrgFirst(true);
         }
         return;
     }
 
+    /**
+     * 普通客户报备客户
+     *
+     * @param averageReportDTO
+     * @return
+     */
+    @Override
+    public ResponseBean averageReportCust(AverageReportDTO averageReportDTO) {
+
+
+        // 当前人员
+        TaPerson person = taPersonMapper.getById(averageReportDTO.getPersonId());
+
+        // 先查看在ta_recommend_customer 手机号是否存在
+        LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaRecommendCustomer::getPhone,averageReportDTO.getPhone());
+        queryWrapper.eq(TaRecommendCustomer::getBuildingId,averageReportDTO.getBuildingId());
+        queryWrapper.isNull(TaRecommendCustomer::getRecommendPerson);
+        List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (taRecommendCustomers.size() > 0) {
+            return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 查询是否在渠道推荐表中
+        LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,averageReportDTO.getBuildingId());
+        channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
+        List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
+        List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
+        if (passCustomer.size() > 0) {
+            return ResponseBean.error("此用户已经被报备", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 入渠道推荐客户表
+        ChannelCustomer channelCustomer = new ChannelCustomer();
+        channelCustomer.setBuildingId(averageReportDTO.getBuildingId());
+        channelCustomer.setName(averageReportDTO.getName());
+        channelCustomer.setPicture(averageReportDTO.getPicture());
+        channelCustomer.setPhone(averageReportDTO.getPhone());
+        channelCustomer.setSex(averageReportDTO.getSex());
+        channelCustomer.setRecommendPerson(averageReportDTO.getPersonId());
+        channelCustomer.setCreateDate(LocalDateTime.now());
+        channelCustomer.setStatus("1");
+        channelCustomer.setOrgId(averageReportDTO.getOrgId());
+        channelCustomerMapper.insert(channelCustomer);
+        return ResponseBean.success(channelCustomer);
+    }
+
     private void fillSomeFieldsOfCustomer(TaRecommendCustomer customer, TaPerson recommender, LocalDateTime now) {
         customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         customer.setStatus(CommConstant.CUSTOMER_REPORT);
         taRecommendCustomer.setBuildingId(params.getString("intention"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
-        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);
             }
         }
 
+        taRecommendCustomer.setCirculationTime(LocalDateTime.now());
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);

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

      */
     private String auditResult;
 
+    /**
+     * 置业顾问
+     */
+    private String realtyConsultant;
+
 }

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

      */
    private String type;
 
+    /**
+     * 置业顾问personiD
+     */
+   private String realtyConsultant;
+
 }

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

             taRecommendCustomer.setPersonId(customer.getPersonId());
             taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+            taRecommendCustomer.setRealtyConsultant(channelCustomerDTO.getRealtyConsultant());
+            taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             taRecommendCustomerMapper.insert(taRecommendCustomer);
             return ResponseBean.success("审核成功");
         }
     /**
      * 驻场确认到访
      *
-     * @param id
+     * @param
      * @param params
      * @return
      */
                 taRecommendCustomer.setPersonId(customer.getPersonId());
                 taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                taRecommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
+                taRecommendCustomer.setCirculationTime(LocalDateTime.now());
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
                 return ResponseBean.success("审核成功");
             }
                 recommendCustomer.setRecommendPerson(customer.getRecommendPerson());
                 recommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
                 recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                recommendCustomer.setRealtyConsultant(params.getRealtyConsultant());
+                recommendCustomer.setCirculationTime(LocalDateTime.now());
                 taRecommendCustomerMapper.updateById(recommendCustomer);
                 return ResponseBean.success("审核成功");
             }
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(params.getId());
             taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+            taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             taRecommendCustomerMapper.updateById(taRecommendCustomer);
             return ResponseBean.success("审核成功");
         }