Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

     TaUser getAdminByAppID(@Param("appid") String appID);
 
     List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
+
+    TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

             return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 手机号解码
         String sessionKey = params.getString("sessionKey");
         String encryptedData = params.getString("encryptedData");
         String iv = params.getString("iv");
+
+        // 楼盘ID
         String buildingId = params.getString("buildingId");
+        // 场景ID
+        String sceneId = params.getString("sceneId");
+        // 访问目标
+        String targetType = params.getString("targetType");
+        // 目标ID
+        String targetId = params.getString("targetId");
+        // 目标名称
+        String targetName = params.getString("targetName");
+        // 推广用户
+        String promoter = params.getString("promoter");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
+        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+            ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
-        // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), buildingId, orgId);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
-        QueryWrapper<TaRecommendCustomer> cus = new QueryWrapper<>();
-        cus.eq("org_id", orgId);
-        cus.eq("phone", phoneNoInfo.getPhoneNumber());
-        cus.orderByDesc("create_date");
-        List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);
-        if (customer.size() > 0) {
-            for (int i = 0; i < customer.size(); i++) {
-                customer.get(i).setPersonId(person.getPersonId());
-                customer.get(i).setPicture(person.getAvatarurl());
-                customer.get(i).setCountry(person.getCountry());
-                customer.get(i).setCity(person.getCity());
-                customer.get(i).setProvince(person.getProvince());
-            }
-//            TaRecommendCustomer customers = customer.get(0);
+        String phone = phoneNoInfo.getPhoneNumber();
 
-            if (!taRecommendCustomerService.updateBatchById(customer)) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-//            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())&& StringUtils.isEmpty(person.getRecommendPerson())){
-//                person.setRecommendPerson(customers.getRecommendPerson());
-//                person.setRecommendPerson(customers.getRecommendPerson());
-//                TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
-//                if(null != recommender.getPersonType()&&!StringUtils.isEmpty(recommender.getPersonType())){
-//                    person.setRecommendPersonType(recommender.getPersonType());
-//                }
-//            }
-
-//            QueryWrapper<TaCustomerPerson> customerPersonQueryWrapper = new QueryWrapper<>();
-//            customerPersonQueryWrapper.eq("person_id",person.getPersonId());
-//            customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());
-//            List<TaCustomerPerson> list = taCustomerPersonService.list(customerPersonQueryWrapper);
-//            if(list.size()<=0){
-//                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
-//            }
+        try {
+            taPersonService.authPhone(
+                    orgId,
+                    openid,
+                    phone,
+                    buildingId,
+                    sceneId,
+                    targetType,
+                    targetId,
+                    targetName,
+                    promoter);
+
+            return ResponseBean.success(phoneNoInfo);
+        } catch (Exception e) {
+//           e.printStackTrace();
+            return ResponseBean.error("授权手机失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
-//        else{
-//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-//            taRecommendCustomer.setPersonId(person.getPersonId());
-//            taRecommendCustomer.setPicture(person.getAvatarurl());
-//            taRecommendCustomer.setCountry(person.getCountry());
-//            taRecommendCustomer.setCity(person.getCity());
-//            taRecommendCustomer.setProvince(person.getProvince());
-//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-//            taRecommendCustomer.setOrgId(getOrgId(request));
-//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
-//
-//        }
-        return ResponseBean.success(phoneNoInfo);
     }
 
     /**

src/main/java/com/huiju/estateagents/controller/TaCustomerFromController.java

+package com.huiju.estateagents.controller;
+
+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.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.huiju.estateagents.service.ITaCustomerFromService;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户来源  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerFromController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerFromController.class);
+
+    @Autowired
+    public ITaCustomerFromService iTaCustomerFromService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom",method= RequestMethod.GET)
+    public ResponseBean taCustomerFromList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerFrom> result = iTaCustomerFromService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom",method= RequestMethod.POST)
+    public ResponseBean taCustomerFromAdd(@RequestBody TaCustomerFrom taCustomerFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFromService.save(taCustomerFrom)){
+                responseBean.addSuccess(taCustomerFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerFrom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerFromDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerFromService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerFromUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerFrom taCustomerFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFromService.updateById(taCustomerFrom)){
+                responseBean.addSuccess(taCustomerFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerFrom/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerFromGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerFromService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/entity/TaCustomerFrom.java

+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 客户来源 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerFrom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private String personId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 用户名
+     */
+    private String personName;
+
+    /**
+     * 目标类型
+     */
+    private String targetType;
+
+    /**
+     * 目标ID
+     */
+    private String targetId;
+
+    /**
+     * 目标名称
+     */
+    private String targetName;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 分享人ID
+     */
+    private String sharePersonId;
+
+    /**
+     * 分享人名称
+     */
+    private String sharePersonName;
+
+    /**
+     * 场景ID
+     */
+    private String sceneId;
+
+    /**
+     * 首次进入小程序
+     */
+    private Boolean isOrgFirst;
+
+    /**
+     * 首次进入项目
+     */
+    private Boolean isProjectFirst;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaCustomerFromMapper.java

+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户来源  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Mapper
+public interface TaCustomerFromMapper extends BaseMapper<TaCustomerFrom> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaSharePersonFromMapper.java

      */
     List<TaSharePersonFrom> selectLiveActivityVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("liveActivityId")String liveActivityId);
 
+    /**
+     * 获取置业的最近一条分享记录
+     * @param orgId
+     * @param buildingId
+     * @param userId
+     * @param personId
+     * @return
+     */
+    TaSharePersonFrom getConsultantLastShare(@Param("orgId") Integer orgId,
+                                             @Param("buildingId") String buildingId,
+                                             @Param("userId") Integer userId,
+                                             @Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/service/ITaCustomerFromService.java

+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户来源  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+public interface ITaCustomerFromService extends IService<TaCustomerFrom> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    void authPhone(Integer orgId,
+                   String openid,
+                   String phone,
+                   String buildingId,
+                   String sceneId,
+                   String targetType,
+                   String targetId,
+                   String targetName,
+                   String promoter) throws Exception;
 }

src/main/java/com/huiju/estateagents/service/impl/TaCustomerFromServiceImpl.java

+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.mapper.TaCustomerFromMapper;
+import com.huiju.estateagents.service.ITaCustomerFromService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户来源  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Service
+public class TaCustomerFromServiceImpl extends ServiceImpl<TaCustomerFromMapper, TaCustomerFrom> implements ITaCustomerFromService {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
     TaChatMapper taChatMapper;
 
     @Autowired
-    private ITaRecommendCustomerService iTaRecommendCustomerService;
+    TaUserMapper taUserMapper;
 
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaCustomerFromMapper taCustomerFromMapper;
+
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
+    @Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
+
     @Autowired
     private ITaPointsRecordsService pointsRecordsService;
 
 
     @Autowired
     private TaShareContentService taShareContentService;
-    
-    @Autowired
-    private TaBuildingMapper taBuildingMapper;
 
 
     @Resource
         return taPersonMapper.savePersonPosition(record);
     }
 
+    /**
+     * 授权手机号
+     * @param orgId
+     * @param openid
+     * @param phone
+     * @param buildingId
+     * @param sceneId
+     * @param targetType
+     * @param targetId
+     * @param targetName
+     * @param promoter
+     * @throws Exception
+     */
+    @Override
+    public void authPhone(Integer orgId, String openid, String phone, String buildingId, String sceneId, String targetType, String targetId, String targetName, String promoter) throws Exception {
+        //
+        LocalDateTime now = LocalDateTime.now();
+
+        // 1. 更新当前人员
+        List<TaPerson> persons = getPersonsByOpenId(openid);
+        if (null == persons || persons.size() != 1) {
+            throw new Exception("当前人员 openid 异常");
+        }
+        TaPerson person = persons.get(0);
+
+        // 更新人员手机号
+        person.setPhone(phone);
+        person.setAuthPhoneTime(now);
+        if (StringUtils.isEmpty(person.getBuildingId())) {
+            person.setBuildingId(buildingId);
+        }
+        if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+        }
+        updateById(person);
+
+        // 2. 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
+
+        // 3. 处理推广人
+        TaPerson recPerson = taPersonMapper.getById(promoter);
+        if (CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
+            recPerson = null;
+        }
+
+        TaUser taUser = null;
+        List<String> withBuildings = null;  // 推广人授权的楼盘
+        boolean isAssociated = false;       // 传入的楼盘与推广人是否有关联关系
+        if (!StringUtils.isEmpty(promoter)) {
+            taUser = taUserMapper.getUserByPerson(orgId, promoter);
+            if (null != taUser) {
+                List<TaPerson> userPerons = new ArrayList<>();
+                userPerons.add(recPerson);
+                taUser.setPersonIds(userPerons);
+
+                withBuildings = taUserMapper.getBuildingIdsOf(taUser.getUserId(), null);
+
+                if (taUser.getIsAdmin()) {
+                    isAssociated = true;
+                } else {
+                    if (null != withBuildings && withBuildings.size() > 0 && !StringUtils.isEmpty(buildingId)) {
+                        isAssociated = withBuildings.contains(buildingId);
+                    }
+                }
+            }
+        }
+
+        // 楼盘
+        TaBuilding taBuilding = null;
+        if (!StringUtils.isEmpty(buildingId)) {
+            taBuilding = taBuildingMapper.selectById(buildingId);
+            if (taBuilding.getStatus().equals(CommConstant.STATUS_DELETE)) {
+                taBuilding = null;
+            }
+        }
+
+        // 3. 处理客户, 没有新增一条记录, 有就依据手机号建立关联
+        TaRecommendCustomer customer = mergeCustomerByPhone(person, taUser, taBuilding, isAssociated, now);
+
+        // 4. 客户来源, 注意不是用户来源
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setPersonId(person.getPersonId());
+        customerFrom.setCustomerId(customer != null ? customer.getCustomerId() :  null);    // 辅助字段, 不必填
+        customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        customerFrom.setTargetName(targetName);
+        customerFrom.setOrgId(person.getOrgId());
+        customerFrom.setSceneId(sceneId);
+        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是首次进入
+        customerFrom.setCreateDate(now);
+
+        if (null != taBuilding) {
+            customerFrom.setBuildingId(buildingId);
+            customerFrom.setBuildingName(taBuilding.getBuildingName());
+            customerFrom.setIsProjectFirst(true);
+        }
+        if (null != recPerson) {
+            customerFrom.setSharePersonId(recPerson.getPersonId());
+            customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
+        }
+
+        taCustomerFromMapper.insert(customerFrom);
+    }
+
+
+    private TaRecommendCustomer mergeCustomerByPhone(TaPerson person, TaUser taUser, TaBuilding building, boolean isAssociated, LocalDateTime now) throws Exception {
+        TaPerson recPerson = null;
+        if (null != taUser) {
+            recPerson = taUser.getPersonIds().get(0);
+        }
+
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("org_id", person.getOrgId());
+        query.eq("phone", person.getPhone());
+
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(query);
+
+        // 如果用户不存在, 则新建一个
+        // 推广人为 TaUser
+        if (null == customers || customers.size() == 0) {
+            TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            customer.setStatus(CommConstant.CUSTOMER_REPORT);
+            customer.setEntryType(CommConstant.ENTRY_INPUT);
+            customer.setCreateDate(now);
+            if (null != recPerson) {
+                customer.setRecommendPerson(recPerson.getPersonId());
+            }
+
+            if (taUser.getIsConsultant()) {
+                customer.setRealtyConsultant(taUser.getUserId().toString());
+            }
+
+            if (isAssociated || null == taUser) {
+                customer.setBuildingId(building.getBuildingId());
+                customer.setIntention(building.getBuildingName());
+            }
+
+            taRecommendCustomerMapper.insert(customer);
+            return customer;
+        } else {
+            for (int i = 0; i < customers.size(); i++) {
+                TaRecommendCustomer customer = customers.get(i);
+                if (null == customer.getPersonId()) {
+                    customer = copyByPerosn(person, customer);
+                }
+
+                if (taUser.getIsConsultant() && StringUtils.isEmpty(customer.getRealtyConsultant())) {
+                    customer.setRealtyConsultant(taUser.getUserId().toString());
+                }
+
+                if (isAssociated || null == taUser) {
+                    if (StringUtils.isEmpty(customer.getBuildingId())) {
+                        customer.setBuildingId(building.getBuildingId());
+                    }
+                    if (StringUtils.isEmpty(customer.getIntention())) {
+                        customer.setIntention(building.getBuildingName());
+                    }
+                }
+
+                taRecommendCustomerMapper.updateById(customer);
+            }
+            return null;
+        }
+    }
+
+    private TaRecommendCustomer copyByPerosn(TaPerson person, TaRecommendCustomer cust) {
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(StringUtils.ifNull(person.getPhone(), person.getTel()));
+        cust.setPicture(StringUtils.ifNull(person.getAvatarurl(), person.getPhoto()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        cust.setOrgId(person.getOrgId());
+
+        return cust;
+    }
+
+    private Integer str2Int(String str) {
+        if (null == str) {
+            return null;
+        }
+
+        try {
+            return Integer.valueOf(str);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
 
     public String codeGenerator (){
         double r = Math.random();

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

     @Autowired
     private TdWxDictMapper tdWxDictMapper;
 
+    @Autowired
+    private TaCustomerFromMapper taCustomerFromMapper;
+
+    @Autowired
+    private TaSharePersonFromMapper taSharePersonFromMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
 //            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
 //        }
 
+        // 首次报备的客户, 写入客户来源表
+        if (!StringUtils.isEmpty(taRecommendCustomer.getBuildingId())) {
+            QueryWrapper<TaCustomerFrom> queryFrom = new QueryWrapper<>();
+            queryFrom.eq("org_id", taRecommendCustomer.getOrgId());
+            queryFrom.eq("building_id", taRecommendCustomer.getBuildingId());
+            boolean has = taCustomerFromMapper.selectCount(queryFrom) > 0;
+            if (!has) {
+                TaBuilding taBuilding = taBuildingMapper.selectById(taRecommendCustomer.getBuildingId());
+
+                TaCustomerFrom customerFrom = new TaCustomerFrom();
+                customerFrom.setPersonId(taRecommendCustomer.getPersonId());
+                customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
+                customerFrom.setPersonName(taRecommendCustomer.getName());
+                customerFrom.setOrgId(taRecommendCustomer.getOrgId());
+//              customerFrom.setSceneId(sceneId);
+                customerFrom.setIsOrgFirst(false);
+                customerFrom.setIsProjectFirst(true);
+                customerFrom.setCreateDate(LocalDateTime.now());
+                customerFrom.setBuildingId(taRecommendCustomer.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setSharePersonId(consultantPerson.getPersonId());
+                customerFrom.setSharePersonName(consultantUser.getUserName());
+
+                // 半小时内如果有当前人员的分享记录
+                // 那么就认为当前客户是通过分享进入的
+                TaSharePersonFrom personShare = taSharePersonFromMapper.getConsultantLastShare(taRecommendCustomer.getOrgId(),
+                        taRecommendCustomer.getBuildingId(),
+                        consultantUser.getUserId(),
+                        taRecommendCustomer.getPersonId());
+                if (null != personShare) {
+                    // 强制转换 targetType
+                    String targetType = personShare.getTargetType().replace("_share", "").replace("dynamic", "activity");
+                    customerFrom.setTargetType(targetType);
+                    customerFrom.setTargetId(personShare.getTargetId());
+                    customerFrom.setTargetName(personShare.getTargetName());
+                }
+
+                taCustomerFromMapper.insert(customerFrom);
+            }
+        }
+
         return ResponseBean.success(taRecommendCustomer);
     }
 

src/main/resources/mapper/TaCustomerFromMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaCustomerFromMapper">
+
+</mapper>

src/main/resources/mapper/TaSharePersonFromMapper.xml

         GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
         order by t.create_date desc
     </select>
+
+    <select id="getConsultantLastShare" resultType="com.huiju.estateagents.entity.TaSharePersonFrom">
+        SELECT *
+        FROM
+            ta_share_person_from t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.building_id = #{buildingId}
+            AND t.share_person = #{userId}
+            AND t.person_id = #{personId}
+            AND t.create_date &gt; DATE_SUB( now( ), INTERVAL 30 MINUTE )
+        ORDER BY t.create_date DESC
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

         </if>
     </select>
 
+    <select id="getUserByPerson" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*
+        FROM
+            ta_user t
+        INNER JOIN ta_person s ON s.org_id = #{orgId} AND s.user_id = t.user_id
+        WHERE
+            t.org_id = #{orgId}
+        AND s.person_id = #{personId}
+        AND t.status &gt; -1
+        Limit 1
+    </select>
+
 </mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

         SELECT
             t.*,
             e.create_date as visit_time
-        FROM ta_share_person_from e
+        FROM ta_customer_from e
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}
-        AND e.share_person = #{userId}
-        AND (
-            e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
-            or ( e.target_type = 'share' and e.target_id = 'index' )
-        )
-        AND e.create_date BETWEEN #{startDate} and #{endDate}
         <if test="buildingId != null and buildingId !=''">
             AND e.building_id = #{buildingId}
         </if>
-        AND e.is_first_time = 1
+        AND e.target_type is not null
+        AND e.create_date BETWEEN #{startDate} and #{endDate}
+        AND e.is_project_first = 1
+        AND t.user_id = #{userId}
 
-        AND t.phone is not null
         AND t.person_type != 'Realty Consultant'
 
 <!--        为了与存储过程一致 -->