傅行帆 3 年前
父节点
当前提交
14b3173d81

+ 2
- 0
src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java 查看文件

393
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
393
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
394
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,channelReportDTO.getBuildingId());
394
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,channelReportDTO.getBuildingId());
395
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getChannelId,taChannelPeople.getChannelId());
395
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getChannelId,taChannelPeople.getChannelId());
396
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getPhone,channelReportDTO.getPhone());
396
         channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
397
         channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
397
         List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
398
         List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
398
         List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
399
         List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
588
         // 查询是否在渠道推荐表中
589
         // 查询是否在渠道推荐表中
589
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
590
         LambdaQueryWrapper<ChannelCustomer> channelCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
590
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,averageReportDTO.getBuildingId());
591
         channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getBuildingId,averageReportDTO.getBuildingId());
592
+        channelCustomerLambdaQueryWrapper.eq(ChannelCustomer::getPhone,averageReportDTO.getPhone());
591
         channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
593
         channelCustomerLambdaQueryWrapper.ne(ChannelCustomer::getStatus,"3");
592
         List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
594
         List<ChannelCustomer> channelCustomers = channelCustomerMapper.selectList(channelCustomerLambdaQueryWrapper);
593
         List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());
595
         List<ChannelCustomer> passCustomer = channelCustomers.stream().filter(e -> "2".equals(e.getStatus())).collect(Collectors.toList());

+ 1
- 1
src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java 查看文件

175
      */
175
      */
176
     @ApiOperation(value = "wx-查询客户信息", notes = "wx-查询客户信息")
176
     @ApiOperation(value = "wx-查询客户信息", notes = "wx-查询客户信息")
177
     @RequestMapping(value="/wx/customerInfo/{customerId}",method= RequestMethod.GET)
177
     @RequestMapping(value="/wx/customerInfo/{customerId}",method= RequestMethod.GET)
178
-    public ResponseBean customerInfoGet(@PathVariable Integer customerId, @RequestHeader("authorization") String token){
178
+    public ResponseBean customerInfoGet(@PathVariable String customerId, @RequestHeader("authorization") String token){
179
         ResponseBean responseBean = new ResponseBean();
179
         ResponseBean responseBean = new ResponseBean();
180
         try {
180
         try {
181
             LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
181
             LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();