From 33253d5fa44facd66688815b0a2c86ca4cd2fc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 6 Nov 2017 15:26:39 +0800 Subject: [PATCH] commit code --- .../fsh/service/CustomerStatServiceImpl.java | 56 ++++++++++++++----- .../job/fsh/service/HouseInfoService.java | 7 +++ .../job/fsh/service/HouseInfoServiceImpl.java | 6 ++ 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/CustomerStatServiceImpl.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/CustomerStatServiceImpl.java index f9c2fc6..1d530f9 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/CustomerStatServiceImpl.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/CustomerStatServiceImpl.java @@ -15,6 +15,7 @@ import com.fangjia.job.common.util.DateUtilCustom; import com.fangjia.job.fsh.document.CustomerStat; import com.fangjia.job.fsh.po.EnterpriseProductUser; import com.fangjia.job.fsh.po.FinancialCustomersConfig; +import com.fangjia.job.fsh.po.HouseInfo; import com.fangjia.job.fsh.po.PotentialCustomersFilterConfig; @Service @@ -143,30 +144,59 @@ public class CustomerStatServiceImpl implements CustomerStatService { end = timeMap.get("end"); } // 判断用户理财广告点击率 - double adClickRate = getfinancialAdClickRate(eid, uid, start, end); - if (adClickRate <= config.getAdClickRate()) { - continue; + if (config.getAdClickRate() > 0) { + double adClickRate = getfinancialAdClickRate(eid, uid, start, end); + if (adClickRate <= config.getAdClickRate()) { + continue; + } } + // 判断房产分析PV - if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/fsh/result"), start, end) <= config.getHouseAnalyPv()) { - continue; + if (config.getHouseAnalyPv() > 0) { + if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/fsh/result"), start, end) <= config.getHouseAnalyPv()) { + continue; + } } + // 判断出售分析PV - if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/saleAnalysis/analysisDetail"), start, end) <= config.getSaleAnalyPv()) { - continue; + if (config.getSaleAnalyPv() > 0) { + if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/saleAnalysis/analysisDetail"), start, end) <= config.getSaleAnalyPv()) { + continue; + } } + // 判断出租管理PV - if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/rent/index"), start, end) <= config.getRentManagerPv()) { - continue; + if (config.getRentManagerPv() > 0) { + if (visitLogService.queryPvCountByUser(eid, uid, Arrays.asList("/rent/index"), start, end) <= config.getRentManagerPv()) { + continue; + } } + // 判断房产数量 - if (houseInfoService.queryCountByEidAndUid(eid, uid) <= config.getHouseCountRank()) { - continue; + if (config.getHouseCountRank() > 0) { + if (houseInfoService.queryCountByEidAndUid(eid, uid) <= config.getHouseCountRank()) { + continue; + } } + + // 判断房产评级 + if (config.getHouseLevel() > 0) { + HouseInfo houseInfo = houseInfoService.findHighLevelHouseInfo(eid, uid); + if (houseInfo == null) { + continue; + } + if (houseInfo.getLevel() != config.getHouseLevel()) { + continue; + } + } + // 判断房产价值排名 - if (this.getHousePriceLevel(eid, uid) <= config.getHousePriceRank()) { - continue; + if (config.getHousePriceRank() > 0) { + if (this.getHousePriceLevel(eid, uid) <= config.getHousePriceRank()) { + continue; + } } + return i; } return 0; diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoService.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoService.java index 975d1ed..62aeee9 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoService.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoService.java @@ -2,6 +2,8 @@ package com.fangjia.job.fsh.service; import java.util.Map; +import com.fangjia.job.fsh.po.HouseInfo; + public interface HouseInfoService { /** @@ -92,4 +94,9 @@ public interface HouseInfoService { */ Long queryUserHouseTotalPrice(Long eid, String uid); + /** + * 查找最高等级的房产信息 + */ + HouseInfo findHighLevelHouseInfo(Long eid, String uid); + } diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoServiceImpl.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoServiceImpl.java index 57bfa96..bab4179 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoServiceImpl.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/HouseInfoServiceImpl.java @@ -107,4 +107,10 @@ public class HouseInfoServiceImpl extends EntityService implements Ho return sum; } + @Override + public HouseInfo findHighLevelHouseInfo(Long eid, String uid) { + return super.getByParams(new String[] { "level" }, new String[] { "eid", "uid" ,"remove_status"}, + new Object[] { eid, uid, 0 }, HouseInfo.level_orders); + } + }