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

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -255,4 +255,14 @@ public class SysUserController extends BaseController {
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
+
+    @RequestMapping(value="/center/logo",method= RequestMethod.GET)
+    public ResponseBean getLogoImg(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -249,7 +249,7 @@ public class TaUserController extends BaseController {
 
     /**
      * 业务端  修改密码
-     * @return
+     * @return/
      */
     @PutMapping(value = "/admin/update/password")
     public ResponseBean updatePassword( @RequestParam String originalPassword,
@@ -339,7 +339,7 @@ public class TaUserController extends BaseController {
         }
     
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -96,6 +96,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Autowired
 	private TaChannelAppRelationMapper taChannelAppRelationMapper;
 
+	@Autowired
+	private TaChannelProxyMapper taChannelProxyMapper;
+
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
@@ -138,6 +141,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("电话号码或登录名重复");
 		}
 
+		//判断渠道端新增小程序最大数
+		QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+		taChannelProxyQueryWrapper.eq("channel_id", channelId);
+		TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
+
+		QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
+		relationQueryWrapper.eq("channel_id", channelId);
+		Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
+		if (miniAppCount >= taChannelProxy.getAppMaxNum()){
+			throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序，需要维护更多项目，请联系相关管理人员");
+		}
+
 		// 先插入 org
 		TaOrg taOrg = new TaOrg();
 		taOrg.setName(taUser.getOrgName());

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -10,11 +10,16 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +27,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,9 +52,15 @@ public class SysUserChannelController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
     @Autowired
     private ITaChannelProxyService iTaChannelProxyService;
 
+    @Autowired
+    private ITaChannelAppRelationService iTaChannelAppRelationService;
+
     /**
      * 修改对象
      * @param sysUser 实体对象
@@ -216,11 +229,31 @@ public class SysUserChannelController extends BaseController {
     public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
                                          @RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() < 0){
+        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() <= 0){
             responseBean.addError("维护小程序数量不得小于0");
             return responseBean;
         }
 
+        taChannelProxy.setExpireDate(taChannelProxy.getExpireDate().plusDays(1L));
+        //更新业务层的登录账号为禁用
+        if (taChannelProxy.getStatus() != null){
+            QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+            taChannelAppRelationQueryWrapper.eq("channel_id", id);
+            List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
+            List<Integer> orgIdList = new ArrayList<>();
+            taChannelAppRelation.forEach(e->{
+                orgIdList.add(e.getOrgId());
+            });
+            if (CollectionUtils.isNotEmpty(orgIdList)){
+                QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+                taUserQueryWrapper.in("org_id", orgIdList);
+                TaUser taUser = new TaUser();
+                taUser.setStatus(taChannelProxy.getStatus());
+                iTaUserService.update(taUser, taUserQueryWrapper);
+            }
+
+        }
+
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         taChannelProxyQueryWrapper.eq("channel_id", id);
         iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);

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

@@ -199,15 +199,21 @@ public class MiniAppController extends BaseController {
             personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
-            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
-                // 添加积分
-                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-            }
-
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+
+            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+                // 校验是否点击过此人的分享
+                boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
+                if (checkPoint){
+                    // 添加积分
+                    applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+                }
+            }
+
+
             Map<Object,Object> map = new HashMap<>();
             map.put("openId",session.getOpenid());
             map.put("orgId",orgId);
@@ -244,7 +250,8 @@ public class MiniAppController extends BaseController {
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
                 sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
                 if(from.equals("dynamic_share")){ // activity_share
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    //产品不认了
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
                     sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
@@ -322,6 +329,19 @@ public class MiniAppController extends BaseController {
         }
     }
 
+    private boolean checkSharePersonFrom(String from, String personId, String targetId, Integer orgId) {
+        QueryWrapper<TaSharePersonFrom> queryWrapper =  new QueryWrapper<>();
+        queryWrapper.eq("target_type",from);
+        queryWrapper.eq("person_id",personId);
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("org_id",orgId);
+        List<TaSharePersonFrom> list = taSharePersonFromService.list(queryWrapper);
+        if (list.size() > 0){
+            return false;
+        }
+        return true;
+    }
+
     /**
      * 登陆接口
      */

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,9 @@ public class TaPersonFromRecordController extends BaseController {
     @Autowired
     public ITaPersonService taPersonService;
 
+    @Autowired
+    private ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -50,6 +54,7 @@ public class TaPersonFromRecordController extends BaseController {
                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         iTaPersonFromRecordService.personFromStatistic();
+        iTsUserBehaviorStatisticService.userBehaviorStatustic();
         responseBean.addSuccess("成功");
         return responseBean;
     }

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

@@ -357,9 +357,9 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType())  + "_share");
             switch (e.getEventType()){
-                case CommConstant.FAVOR_PROJECT:
+                case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
                 case CommConstant.POINTS_CHANGE_HELP:
@@ -371,7 +371,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.CAROUSEL_NEWS:
                     e.setNewsNum(shareNum);
                     break;
-                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
+                case CommConstant.FAVOR_PROJECT:
                     e.setBuildingNum(shareNum);
                     break;
                 case CommConstant.EVENT_H5:

src/main/java/com/huiju/estateagents/excel/TaActivityDynamicEnlistExport.java

@@ -41,10 +41,10 @@ public class TaActivityDynamicEnlistExport implements Serializable {
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index = 4)
+    @ExcelProperty(value = "引流人", index = 4)
     private String sharePersonName;
 
-    /**
+    /*
      * 公司
      */
     @ColumnWidth(15)

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -145,7 +145,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             // 只尝试去解析
             Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
         } catch (ExpiredJwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, Token 已过期", ResponseBean.ERROR_AUTH_EXPIRED);
+            ResponseBean resp = ResponseBean.error("权限验证非法, 身份信息已过期", ResponseBean.ERROR_AUTH_EXPIRED);
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -5,6 +5,7 @@ import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class CustomerStatisticTimeJob extends BaseController {
     @Autowired
     public ITaPersonFromRecordService iTaPersonFromRecordService;
 
+    @Autowired
+    private ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
     /**
      *
      * 盘客工具数据统计
@@ -80,6 +84,9 @@ public class CustomerStatisticTimeJob extends BaseController {
 
         //统计新增来源用户
         iTaPersonFromRecordService.personFromStatistic();
+
+        //统计用户行为数据
+        iTsUserBehaviorStatisticService.userBehaviorStatustic();
     }
 
 }

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

@@ -221,4 +221,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
 
     IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
+
+    int selectFromNum(@Param("orgId") Integer orgId,@Param("personType") String personType);
 }

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

@@ -216,10 +216,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
         // 用户来源饼状
-        // 来源置业顾问, 来源全民经纪人，自由进入
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
+        // 来源置业顾问, 来源客户，其他
+        Integer total = taPersonMapper.selectFromNum(orgId, null) ;
+        Integer person_realty_consultant = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_estate_agent = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_ESTATE_CUSTOMER);
+        Integer person_null = total - person_realty_consultant - person_estate_agent;
         Map<String, Object> map = new HashMap<>();
         map.put("person_realty_consultant", person_realty_consultant);
         map.put("person_estate_agent", person_estate_agent);

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

@@ -304,7 +304,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
 
@@ -458,6 +458,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            return responseBean;
+        }
+
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
@@ -553,7 +559,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
 
@@ -944,9 +950,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (taBuilding.getIsMain() != 1){
             return true;
         }
-        if (operte.equals("update") && (info.getStatus() == 2)){
-            return true;
-        }
+//        if (operte.equals("update") && (info.getStatus() == 2)){
+//            return true;
+//        }
         if (operte.equals("updateStatus") && status == 2){
             return true;
         }

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

@@ -63,18 +63,6 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
             throw new Exception("未知的小程序所属对象");
         }
 
-        //判断渠道端新增小程序最大数
-        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
-        taChannelProxyQueryWrapper.eq("channel_id", channelId);
-        TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
-
-        QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
-        relationQueryWrapper.eq("channel_id", channelId);
-        Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
-        if (miniAppCount >= taChannelProxy.getAppMaxNum()){
-            throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序，需要维护更多项目，请联系相关管理人员");
-        }
-
         TaMiniapp orign = this.getById(taMiniapp.getMiniappId());
         if (null != orign) {
             if (!this.updateById(taMiniapp)) {

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

@@ -61,7 +61,7 @@ public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecor
         queryWrapper.eq("person_id",taPersonVisitRecord.getPersonId());
         int count = taPersonFromRecordMapper.selectCount(queryWrapper);
         if(count > 0){
-            taPersonFromRecord.setIsFirstTime(false);
+            return;
         }else {
             taPersonFromRecord.setIsFirstTime(true);
         }

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

@@ -132,7 +132,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectById(e.getPersonId());
 			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
@@ -223,7 +223,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

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

@@ -88,9 +88,15 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
     @Autowired
     private TdPersonFromMapper tdPersonFromMapper;
 
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -571,16 +577,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            Map<String,String>geoInfo = new HashMap<>();
-            geoInfo.put("provience",person.getProvince());
-            geoInfo.put("country",person.getCountry());
-            TdCity city = cityMapper.selectById(person.getCity());
-            if(null!=city){
-                geoInfo.put("city",city.getName());
-            }else {
-                geoInfo.put("city","未知");
-            }
-            taRecommendCustomer.setGeoInfo(geoInfo);
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
@@ -600,11 +596,29 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         //构造来源类型
         taRecommendCustomer.setPersonFrom("");
-        if (null != person && null != person.getFromCode()){
-            QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-            tdPersonFromQueryWrapper.eq("from_code",person.getFromCode());
-            TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-            taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+        if (null != person){
+            Map<String,String>geoInfo = new HashMap<>();
+            geoInfo.put("provience",person.getProvince());
+            geoInfo.put("country",person.getCountry());
+            TdCity city = cityMapper.selectById(person.getCity());
+            if(null!=city){
+                geoInfo.put("city",city.getName());
+            }else {
+                geoInfo.put("city","未知");
+            }
+            taRecommendCustomer.setGeoInfo(geoInfo);
+
+            QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",person.getOrgId());
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("is_first_time",1);
+            List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+            if (taPersonFromRecords.size() > 0){
+                QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                taRecommendCustomer.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+            }
         }
 
         return taRecommendCustomer;
@@ -612,7 +626,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
-        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+        TaPerson taPerson = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
             IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
@@ -656,26 +670,33 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 }
             });
             taPersonVisitRecordIPage.setRecords(records);
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
-            taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
-            TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
+            taPerson.setVisitRecords(taPersonVisitRecordIPage);
+            taPerson.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
+            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taPerson.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
+            taPerson.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
+            TdCity city = cityMapper.selectById(taPerson.getCity());
             if(null != city){
-                taRecommendCustomer.setCity(city.getName());
+                taPerson.setCity(city.getName());
             }
 
             //构造来源类型
-            taRecommendCustomer.setPersonFrom("");
-            if (null != taRecommendCustomer.getFromCode()){
-                QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-                tdPersonFromQueryWrapper.eq("from_code",taRecommendCustomer.getFromCode());
-                TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-                taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+            taPerson.setPersonFrom("");
+            if (null != taPerson){
+                QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",taPerson.getOrgId());
+                queryWrapper.eq("person_id",taPerson.getPersonId());
+                queryWrapper.eq("is_first_time",1);
+                List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+                if (taPersonFromRecords.size() > 0){
+                    QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                    tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                    TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                    taPerson.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+                }
             }
         }
-        return taRecommendCustomer;
+        return taPerson;
     }
 
     @Override

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

@@ -71,6 +71,10 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         queryWrapper.eq("tagert_type", typeOf);
         List<TaShare> uvs = taShareMapper.selectList(queryWrapper);
         if (null != uvs && uvs.size() > 0) {
+            //更新分享为最新时间
+            TaShare taShare = new TaShare();
+            taShare.setCreateDate(LocalDateTime.now());
+            taShareMapper.update(taShare, queryWrapper);
             return ResponseBean.success("");
         }
 

src/main/java/com/huiju/estateagents/statistic/controller/TsUserBehaviorStatisticController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.statistic.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 com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+
+/**
+ * <p>
+    * 用户行为统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@RestController
+@RequestMapping("/api")
+public class TsUserBehaviorStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsUserBehaviorStatisticController.class);
+
+    @Autowired
+    public ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsUserBehaviorStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsUserBehaviorStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsUserBehaviorStatistic> result = iTsUserBehaviorStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.POST)
+    public ResponseBean tsUserBehaviorStatisticAdd(@RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.save(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsUserBehaviorStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsUserBehaviorStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsUserBehaviorStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.updateById(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsUserBehaviorStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 用户行为
+     * @return
+     */
+    @GetMapping(value = "/admin/tsUserBehavior")
+    public ResponseBean selectUserBehavior(
+                                           @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           HttpServletRequest request) {
+        return iTsUserBehaviorStatisticService.selectUserBehavior(getOrgId(request), startDate, endDate, buildingId);
+    }
+}

src/main/java/com/huiju/estateagents/statistic/entity/TsUserBehaviorStatistic.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户行为统计表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsUserBehaviorStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户行为统计主键
+     */
+    @TableId(value = "behavior_id", type = IdType.AUTO)
+    private Integer behaviorId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 行为数量统计
+     */
+    private Integer behaviorNum;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户行为统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Mapper
+public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehaviorStatistic> {
+
+    List<TsUserBehaviorStatistic> seleUserBehaviorList();
+
+    int deleteByDate();
+
+    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITsUserBehaviorStatisticService.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 用户行为统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+public interface ITsUserBehaviorStatisticService extends IService<TsUserBehaviorStatistic> {
+
+    void userBehaviorStatustic();
+
+    /**
+     * 按日期获取统计列表
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -0,0 +1,66 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdBizEvent;
+import com.huiju.estateagents.entity.TdBizEventType;
+import com.huiju.estateagents.mapper.TdBizEventTypeMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.mapper.TsUserBehaviorStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户行为统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Service
+public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehaviorStatisticMapper, TsUserBehaviorStatistic> implements ITsUserBehaviorStatisticService {
+
+    @Autowired
+    private TsUserBehaviorStatisticMapper tsUserBehaviorStatisticMapper;
+
+    @Autowired
+    private TdBizEventTypeMapper tdBizEventTypeMapper;
+
+    @Override
+    public void userBehaviorStatustic() {
+        //查询当天信息
+        List<TsUserBehaviorStatistic> list = tsUserBehaviorStatisticMapper.seleUserBehaviorList();
+        //删除当天信息
+        tsUserBehaviorStatisticMapper.deleteByDate();
+        //批量插入信息
+        this.saveBatch(list);
+    }
+
+    /**
+     * 按日期获取统计列表
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserBehavior", tsUserBehaviorStatistics);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

src/main/resources/mapper/TaPersonFromRecordMapper.xml

@@ -9,7 +9,7 @@
             t.event_type,
             t.org_id,
             t.create_date,
-            sum( IF ( p.photo IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
+            sum( IF ( p.phone IS NOT NULL OR p.tel IS NOT NULL, 1, 0 ) ) AS registered_num
         FROM
             ta_person_from_record t
             LEFT JOIN ta_person p ON t.person_id = p.person_id

src/main/resources/mapper/TaPersonMapper.xml

@@ -575,4 +575,23 @@ FROM
         </if>
         order by t.create_date desc
     </select>
+
+    <select id="selectFromNum" resultType="java.lang.Integer">
+        SELECT
+            count( 1 )
+        FROM
+        (
+            SELECT
+                t.from_record_id,
+                t.person_id
+            FROM
+                ta_person_from_record t
+                LEFT JOIN ta_person p ON t.share_person_id = p.person_id
+                WHERE t.is_first_time = 1
+            and t.org_id = #{orgId}
+            <if test="personType !=null and personType !=''">
+                and p.person_type = #{personType}
+            </if>
+                GROUP BY t.person_id) d
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -23,16 +23,20 @@
     </sql>
 
     <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select * from ta_person_visit_record t
+        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}
         <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND t.building_id in
+            AND (b.parent_type_id = 'public' or t.building_id in
             <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                 #{personBuilding.buildingId}
             </foreach>
+            )
         </if>
         <if test="buildingId != null and buildingId != ''">
-            AND t.building_id = #{buildingId}
+            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
         </if>
         order by t.visit_time desc
     </select>
@@ -119,17 +123,18 @@
 
     <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         SELECT
-            t.* ,
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,building_id, t.status, t.is_first_time,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
 	        p.avatarurl
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} and event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND share_person = #{userId} and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
+            where p.user_id != #{userId}
         GROUP BY
             t.person_id
         ORDER BY
-	        t.visit_time DESC
+	        t.create_date DESC
     </select>
 
 
@@ -150,7 +155,12 @@
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from (
             select
-            <include refid="columnSql"></include>,
+<!--            <include refid="columnSql"></include>,-->
+            t.person_id,
+            c.person_type,
+            t.create_date as visit_time,
+            t.tagert_type as event_type,
+            t.be_share as target_id,
             b.name as drainageName,
             d.building_name as buildingName,
             tn.news_name as newsName,
@@ -158,26 +168,25 @@
             tsa.activity_name as groupActivityName,
             tbd.title as activityName,
             b.drainage_id
-            from ta_person_visit_record t
-            left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_building d on t.target_id = d.building_id
-            left join ta_news tn on t.target_id = tn.news_id
-            left join ta_help_activity tha on t.target_id = tha.help_activity_id
-            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on t.share_person_id = c.person_id
-            where
-            t.share_person_id != t.person_id and t.share_person_id is not null and t.share_person_id != ''
+            from ta_share t
+            left join ta_drainage b on t.be_share = b.drainage_id
+            left join ta_building d on t.be_share = d.building_id
+            left join ta_news tn on t.be_share = tn.news_id
+            left join ta_help_activity tha on t.be_share = tha.help_activity_id
+            left join ta_share_activity tsa on t.be_share = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.be_share = tbd.dynamic_id
+            left join ta_person c on t.person_id = c.person_id
+            where 1=1
             <if test="orgId != null and orgId != ''">
-                and t.org_id = #{orgId}
+                and c.org_id = #{orgId}
             </if>
             <if test="eventType !=null and eventType != ''">
-                and t.event_type = #{eventType}
+                and t.tagert_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
                 and (
-                (b.name like concat('%',#{activityName},'%') and t.event_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.event_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.event_type = 'news')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.event_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.event_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.event_type = 'activity')
+                (b.name like concat('%',#{activityName},'%') and t.tagert_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.tagert_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.tagert_type = 'news')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.tagert_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.tagert_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.tagert_type = 'activity')
                 )
             </if>
             <if test="shareName !=null and shareName != ''">
@@ -187,23 +196,23 @@
                 and c.phone = #{shareTel}
             </if>
             <if test="personType == 'Realty Consultant'">
-                and t.consultant_id is not null  and t.consultant_id != ''
+                and c.person_type = 'Realty Consultant'
             </if>
             <if test="personType == 'customer'">
-                and t.consultant_id is null
+                and c.person_type != 'Realty Consultant'
             </if>
             <if test="buildingId !=null and buildingId != ''">
-                and t.building_id = #{buildingId}
+                and d.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND t.building_id in
+                AND d.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
-            order by t.visit_time desc
+            order by t.create_date desc
         ) t
-        group by t.person_id, t.share_person_id,t.target_id,t.event_type
+        group by t.person_id, t.target_id,t.event_type
         order by t.visit_time desc
     </select>
 
@@ -218,7 +227,7 @@
                 a.address,
                 a.price,
                 t.tagert_type as eventType,
-				t.create_date
+				t.create_date as visit_time
                 from ta_share t
                 left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
                 where t.tagert_type = 'project'
@@ -237,7 +246,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_building_dynamic b on t.be_share = b.dynamic_id
         where t.tagert_type = 'activity'
@@ -256,7 +265,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_help_activity c on t.be_share = c.help_activity_id
         where t.tagert_type = 'help'
@@ -275,7 +284,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_share_activity d on t.be_share = d.group_activity_id
         where t.tagert_type = 'group'
@@ -294,7 +303,7 @@
         '2' as building_name,
         '3' as address,
         t.tagert_type as eventType,
-		t.create_date
+		t.create_date as visit_time
         from ta_share t
         left join ta_news e on t.be_share = e.news_id
         where t.tagert_type = 'news'
@@ -313,7 +322,7 @@
             '2' as building_name,
             '3' as address,
 			t.tagert_type as eventType,
-			t.create_date
+			t.create_date as visit_time
             from ta_share t
             left join ta_drainage f on t.be_share = f.drainage_id
             where t.tagert_type = 'h5'
@@ -321,16 +330,19 @@
             ) t
             group by t.target_id
         ) t
-        order by t.create_date desc
+        order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">
         select count(DISTINCT t.person_id)  from ta_share_person_from t
+        left join ta_person a on t.person_id = a.person_id
         where
         t.share_person = #{userId}
-        and t.orgId = #{orgId}
+        and t.org_id = #{orgId}
         and t.target_type = #{eventType}
         and t.target_id = #{targetId}
+        and t.status = 1
+        and a.user_id != #{userId}
         group by t.target_type
     </select>
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -559,6 +559,7 @@ FROM
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
         limit #{pageCode}, #{pageSize}
@@ -632,11 +633,14 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        left join ta_person c on a.realty_consultant = c.user_id
+        LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
+        LEFT JOIN ta_user d on d.user_id = a.realty_consultant
+        LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
         <where>
             a.status > 0
             and a.verify_status = 1
-            and realty_consultant is not null
+            and a.realty_consultant is not null
+            and a.realty_consultant != ''
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>

src/main/resources/mapper/TaUserMapper.xml

@@ -21,7 +21,7 @@
             m.token,
             m.NAME AS miniappName,
             m.qr_code AS qrCode,
-            z.expire_date,
+            t.exp_date as expire_date,
             m.org_id
         FROM
             ta_user t

src/main/resources/mapper/TdBizEventMapper.xml

@@ -32,7 +32,7 @@
         ) as building_intention
 
         ON biz_event.event_id = building_intention.event_id
-
+        where biz_event.points is not null
     </select>
 
 </mapper>

src/main/resources/mapper/statistic/TsUserBehaviorStatisticMapper.xml

@@ -0,0 +1,95 @@
+<?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.statistic.mapper.TsUserBehaviorStatisticMapper">
+    <delete id="deleteByDate">
+        delete from ts_user_behavior_statistic where DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( NOW( ), '%Y-%m-%d' )
+    </delete>
+
+    <select id="seleUserBehaviorList"
+            resultType="com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic">
+                SELECT
+            temp_date.date AS create_date,
+            temp_date.type_name AS event_name,
+            temp_date.type_id AS event_type,
+            temp.activityCount AS behavior_num,
+            temp.building_id,
+            temp.org_id
+        FROM
+            (
+        SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            b.type_id,
+            b.type_name,
+            a.rownum
+        FROM
+            sequence a,
+            td_biz_event_type b
+            ) AS temp_date
+            LEFT JOIN (
+        SELECT
+            COUNT( 1 ) AS activityCount,
+            tpvr.event_type,
+            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ) AS date,
+            tpvr.building_id,
+            tp.org_id
+        FROM
+            ta_person tp
+            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+        WHERE
+            tp.person_type IN ( 'customer', 'drift', 'estate agent' )
+        GROUP BY
+            tpvr.event_type,
+            DATE_FORMAT( tpvr.visit_time, '%Y-%m-%d' ),
+            tp.org_id,
+            tpvr.building_id
+            ) AS temp ON temp_date.date = temp.date
+            AND temp_date.type_id = temp.event_type where temp_date.date = DATE_FORMAT( now( ), '%Y-%m-%d' )
+    </select>
+    <select id="seleBehaviorListByDate"
+            resultType="com.huiju.estateagents.po.PersonPO">
+        SELECT
+            temp_date.date AS date,
+            temp_date.type_name AS activity,
+            temp.activityCount AS activityCount
+        FROM
+        (
+            SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            b.type_id,
+            b.type_name
+            FROM
+            sequence a,
+            td_biz_event_type b
+            <trim prefix="where">
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+            </trim>
+        ) AS temp_date
+        LEFT JOIN (
+            SELECT
+            tp.event_type,
+            tp.event_name as activity,
+            sum( tp.behavior_num )  as activityCount,
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' )  as date
+            FROM
+            ts_user_behavior_statistic tp
+            where tp.org_id = #{orgId}
+            <if test="startDate != null or endDate != null">
+                AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
+            </if>
+            <if test="startDate == null or endDate == null">
+                AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            <if test="buildingId != null and buildingId != ''">
+                and tp.building_id = #{buildingId}
+            </if>
+            GROUP BY
+            DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
+            tp.event_type
+        ) AS temp ON temp_date.date = temp.date
+        AND temp_date.type_id = temp.event_type
+        ORDER BY
+        temp_date.date ASC
+    </select>
+</mapper>