From 576f85576f5d08623bf1ca72835d9b2f43e2681d Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 16 Jan 2022 00:06:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxChartServiceImpl.java | 21 +++---------------- .../resources/mapper/WxCouponOrderMapper.xml | 1 - 2 files changed, 3 insertions(+), 19 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 1debcea61..201e77985 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1579,12 +1579,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -7); Date sTime = c.getTime(); List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - //TOOD 待优化 - //List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); - List datas = null; - if (true) { - return new ResultData(); - } + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); @@ -1626,12 +1621,7 @@ public class WxChartServiceImpl implements WxChartDataService { Date eTime = c.getTime();//明天0点 c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - //TODO 待优化数据 - //List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); - List datas = null; - if (true ) { - return new ResultData(); - } + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); List monthVos = new ArrayList<>();//周消费金额 Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { @@ -1770,12 +1760,7 @@ public class WxChartServiceImpl implements WxChartDataService { c.add(Calendar.DAY_OF_YEAR, -30);//三十天前 Date sTime = c.getTime(); List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); - //TODO 待优化数据 - //List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); - List datas = null; - if(true) { - return new ResultData(); - } + List datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); Map dataMap = new HashMap<>(); for (CUserDateAmountVo v : datas) { dataMap.put(v.getXTime(), v.getPrice()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 002eadada..86c8bc011 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -671,7 +671,6 @@ GROUP BY xTime -