diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java index 9c0993ae0..27657a036 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DateUtil.java @@ -1556,8 +1556,17 @@ public class DateUtil { return c.getTime(); } + /** + * 增加日期的天数 + * 此方法用于给定一个日期后,增加指定数量的天数 + * + * @param date 原始日期 + * @param amount 要增加的天数,正数表示未来日期,负数表示过去日期 + * @return 增加天数后的日期 + */ public static Date add(Date date,int amount){ - return add(date,Calendar.DATE,amount); + // 调用另一个重载的add方法,将Calendar.DATE作为参数,表示按天数增加 + return add(date,Calendar.DATE,amount); } public static String addMonth(Date date, int month){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 57f2da122..380683b01 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -759,6 +759,9 @@ public class PropertyController { //int avgPrice = districtStatService.findLatestDistrictAvgPrice(new DistrictKey(district), null); // 返回2B价格,小程序用,其他也改为2B int avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), null); + if(avgPrice == 0){ + avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), DateUtil.add(new Date(), -7)); + } if (avgPrice != 0) { districtInfoDto.setAvgPrice(avgPrice); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java index 389638fa6..dc1b65d9e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java @@ -1527,7 +1527,12 @@ public class DistrictStatServiceImpl implements DistrictStatService { @Override public int findLatestDistrictAvgPrice2B(DistrictKey districtKey, Date weekend) { if (weekend == null) { - weekend = DateUtil.getFirstDayOfWeek(new Date()); + Date now = DateUtil.truncateDay(new Date()); + if(!DateUtil.isSunday(now)){ + weekend = DateUtil.getFirstDayOfWeek(now); + }else{ + weekend = now; + } } String cacheKey = districtKey.getCity() + "_" + districtKey.getRegion() + "_" + districtKey.getName() + "_2B_" + DateUtil.formatToYYMMDD(weekend); Object obj = CacheUtils.getValue(this.getClass(), cacheKey);