From f7bddbf386defffbce2630a92310a39734748738 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 10 May 2019 14:59:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=9F=E8=AE=A1][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=BE=85=E7=BC=B4=E5=95=86?= =?UTF-8?q?=E6=88=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxChartServiceImpl.java | 6 ++++-- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) 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 535ebe196..0bb91605f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -307,7 +307,7 @@ public class WxChartServiceImpl implements WxChartDataService { //商铺出租率走势 if (chart.equals(EnumChart.RENT_RATE_HISTORY.getCode())) { - return getRentRateHistory(tenantId); + return getRentRateHistory(tenantId,paramsMap); } return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); @@ -318,7 +318,9 @@ public class WxChartServiceImpl implements WxChartDataService { * @param tenantId * @return */ - private ResultData getRentRateHistory(String tenantId) { + private ResultData getRentRateHistory(String tenantId,Map paramsMap) { + Integer dateType = Integer.parseInt(paramsMap.get("dateType")); + Map datamap = new LinkedHashMap<>(); datamap.put("2018/10","10%"); datamap.put("2018/11","20%"); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index b9e96f149..040bb9497 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -806,6 +806,7 @@ select c.*,wcc.target_ad targetAd,wcc.id couponChannelId from wx_coupon c inner join wx_coupon_channel wcc on wcc.coupon_id = c.id left join wx_coupon_merchant wc on wc.product_id = c.id where 1=1 + and c.remain_inventory>0 and wc.merchant_id=#{merchantId}