From 374e70ac5bd370086f9ed68b4c02f3307f98e1be Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 15 Feb 2022 16:24:31 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/DataTowerServiceImpl.java | 8 +++----- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index d2f73a8cc..414af9915 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -410,16 +410,14 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap dataMap = new HashMap<>(); dataMap.put("shop", shopRunning(tenantEntity)); - dataMap.put("rent", rentRunning(tenantEntity)); - dataMap.put("report", reportRunning(tenantEntity)); - //TODO 待优化数据 +// dataMap.put("rent", rentRunning(tenantEntity)); +// dataMap.put("report", reportRunning(tenantEntity)); dataMap.put("car", carRunning(tenantEntity)); - dataMap.put("car", null); dataMap.put("coupon", couponRunning(tenantEntity)); dataMap.put("visitor", visitorRunning(tenantEntity)); dataMap.put("contract", contractRunning(tenantEntity)); dataMap.put("message", messageRunning(tenantEntity)); - dataMap.put("bill", billRunning(tenantEntity)); +// dataMap.put("bill", billRunning(tenantEntity)); return dataMap; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ccc1c7a4b..bf1fc34b0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -667,7 +667,7 @@ group by co.coupon_id - SELECT DATE_FORMAT(create_date,'%Y-%m-%d') as xTime,IFNULL(SUM(coupon_price),0) as price from wx_coupon_order where create_date_times >= unix_timestamp(#{startTime}) and create_date_times < unix_timestamp(#{endTime})