11

src/main/java/com/yunzhi/marketing/excel/redPacket/RedPacketVisitRecordtExport.java

@@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
 /**
- * 红包访问记录导出实体
+ * 红包导出实体
  *
  * @author gusy
  * @date 2020/6/7 15:46

src/main/java/com/yunzhi/marketing/mapper/TaPersonVisitRecordMapper.java

@@ -88,4 +88,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     List<TaPersonVisitRecord> selectTapersonFromShare();
 
     Integer selectTodayVisitCount(@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime now);
+
+    List<TaPersonVisitRecord> visitRecordByPersonIdNew(@Param("personId") String personId);
 }

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

@@ -7,16 +7,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaChannel;
+import com.yunzhi.marketing.entity.TaChannelPerson;
 import com.yunzhi.marketing.entity.TaPerson;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.service.ITaRecommendCustomerService;
+import com.yunzhi.marketing.service.TaChannelPersonService;
+import com.yunzhi.marketing.service.TaChannelService;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
 import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoModifyRecordService;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
+import com.yunzhi.marketing.xlk.vo.CustomerInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +60,12 @@ public class CustomerInfoController extends BaseController {
     @Autowired
     public ITaRecommendCustomerService iTaRecommendCustomerService;
 
+    @Autowired
+    private TaChannelPersonService taChannelPersonService;
+
+    @Autowired
+    private TaChannelService taChannelService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -229,4 +242,50 @@ public class CustomerInfoController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     * @param
+     */
+    @ApiOperation(value = "admin-查询客户信息", notes = "admin-查询客户信息")
+    @RequestMapping(value="/admin/customerInfo/{customerId}",method= RequestMethod.GET)
+    public ResponseBean customerInfoPc(@PathVariable String customerId, @RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        CustomerInfoVO customerInfoVO = new CustomerInfoVO();
+        try {
+            LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
+
+            CustomerInfo customerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
+
+            TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
+            if (null == customerInfo && null == customer) {
+                return ResponseBean.error("请求客户不存在", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            // 查看置业顾问信息
+            if (!StringUtils.isEmpty(customer.getRealtyConsultant())) {
+                TaPerson realtyPerson = taPersonService.getById(customer.getRealtyConsultant());
+                customerInfoVO.setRealtyConsultantPerson(realtyPerson);
+            }
+
+            // 获取渠道名字
+            LambdaQueryWrapper<TaChannelPerson> channelPersonLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            channelPersonLambdaQueryWrapper.eq(TaChannelPerson::getPersonId,customer.getPersonId());
+            TaChannelPerson taChannelPerson = taChannelPersonService.getOne(channelPersonLambdaQueryWrapper);
+            if (null != taChannelPerson) {
+                TaChannel taChannel = taChannelService.getById(taChannelPerson.getChannelId());
+                customerInfoVO.setChannelName(taChannel.getChannelName());
+            }
+
+            customerInfoVO.setTaRecommendCustomer(customer);
+            customerInfoVO.setCustomerInfo(customerInfo);
+            iCustomerInfoService.getOtherInfo(customerInfoVO);
+            responseBean.addSuccess(customerInfoVO);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/service/ICustomerInfoService.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.xlk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import com.yunzhi.marketing.xlk.vo.CustomerInfoVO;
 
 /**
  * <p>
@@ -13,4 +14,9 @@ import com.yunzhi.marketing.xlk.entity.CustomerInfo;
  */
 public interface ICustomerInfoService extends IService<CustomerInfo> {
 
+    /**
+     * 获取其他信息
+     * @param customerInfoVO
+     */
+    void getOtherInfo(CustomerInfoVO customerInfoVO);
 }

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

@@ -1,11 +1,23 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.drainage.entity.TaDrainage;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.mapper.*;
+import com.yunzhi.marketing.service.IMiniAppService;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
 import com.yunzhi.marketing.xlk.mapper.CustomerInfoMapper;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
+import com.yunzhi.marketing.xlk.vo.CustomerInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 客户基本信息表  服务实现类
@@ -17,4 +29,55 @@ import org.springframework.stereotype.Service;
 @Service
 public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, CustomerInfo> implements ICustomerInfoService {
 
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
+    @Autowired
+    TaPersonVisitRecordMapper taPersonVisitRecordMapper;
+
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    /**
+     * 获取其他信息
+     *
+     * @param customerInfoVO
+     */
+    @Override
+    public void getOtherInfo(CustomerInfoVO customerInfoVO) {
+        if (StringUtils.isEmpty(customerInfoVO.getTaRecommendCustomer().getPersonId())) {
+            return;
+        }
+
+        // 获取person用户信息
+        String personId = customerInfoVO.getTaRecommendCustomer().getPersonId();
+        TaPerson taPerson = taPersonMapper.getById(personId);
+        if (!StringUtils.isEmpty(personId)) {
+            List<TaPersonVisitRecord> records = taPersonVisitRecordMapper.visitRecordByPersonIdNew(personId);
+            records.forEach(e -> {
+                //获取活动标题
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
+                    TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+                    if (null != taBuildingDynamic) {
+                        e.setActivityName(taBuildingDynamic.getTitle());
+                    }
+
+                }
+            });
+            customerInfoVO.setPersonVisitRecords(records);
+            customerInfoVO.setVisitTimes(records.size());
+            customerInfoVO.setPersonIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId, null));
+//            customerInfoVO.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
+//            customerInfoVO.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
+        }
+    }
 }

src/main/java/com/yunzhi/marketing/xlk/vo/CustomerInfoVO.java

@@ -0,0 +1,28 @@
+package com.yunzhi.marketing.xlk.vo;
+
+import com.yunzhi.marketing.entity.PersonIntention;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.entity.TaPersonVisitRecord;
+import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CustomerInfoVO {
+
+    private CustomerInfo customerInfo;
+
+    private TaRecommendCustomer taRecommendCustomer;
+
+    private List<TaPersonVisitRecord> personVisitRecords;
+
+    private  List<PersonIntention> personIntentions;
+
+    private Integer visitTimes;
+
+    private TaPerson realtyConsultantPerson;
+
+    private String channelName;
+}

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -41,6 +41,15 @@
         order by t.visit_time desc
     </select>
 
+    <select id="visitRecordByPersonIdNew" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
+        select
+        t.* ,
+        b.parent_type_id from ta_person_visit_record t
+        left join td_biz_event_type b on t.event_type = b.type_id
+        where t.person_id = #{personId}
+        order by t.visit_time desc
+    </select>
+
     <select id="selectAll" resultType="com.yunzhi.marketing.entity.TaPersonVisitRecord">
         SELECT
             tpvr.record_id as recordId,