diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index df8ed3ea6..148a0ccbf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -305,11 +305,32 @@ public class WxChartServiceImpl implements WxChartDataService { return getSaleDataHistory(tenantId, startdate, enddate); } - + //商铺出租率走势 + if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { + return getRentRateHistory(tenantId); + } return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); } + /** + * 首页商铺出租率走势 + * @param tenantId + * @return + */ + private ResultData getRentRateHistory(String tenantId) { + HashMap datamap = new HashMap<>(); + datamap.put("2018/10","10%"); + datamap.put("2018/11","20%"); + datamap.put("2018/12","10%"); + datamap.put("2019/01","10%"); + datamap.put("2019/02","30%"); + datamap.put("2019/03","40%"); + datamap.put("2019/04","10%"); + datamap.put("2019/05","20%"); + return new ResultData(datamap); + } + /** * 解单数据 - 月 * @param tenantId diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index 715ee30b4..2afa13a43 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -52,6 +52,9 @@ and `is_del` = #{isDel} + + and `status` = #{status} + and id in