|
|
|
@@ -1579,12 +1579,7 @@ public class WxChartServiceImpl implements WxChartDataService { |
|
|
|
c.add(Calendar.DAY_OF_YEAR, -7); |
|
|
|
Date sTime = c.getTime(); |
|
|
|
List<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); |
|
|
|
//TOOD 待优化 |
|
|
|
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
List<CUserDateAmountVo> datas = null; |
|
|
|
if (true) { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
Map<String, Integer> 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<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); |
|
|
|
//TODO 待优化数据 |
|
|
|
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
List<CUserDateAmountVo> datas = null; |
|
|
|
if (true ) { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额 |
|
|
|
Map<String, Integer> 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<TenantEntity> tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); |
|
|
|
//TODO 待优化数据 |
|
|
|
//List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
List<CUserDateAmountVo> datas = null; |
|
|
|
if(true) { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantEntitys, tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), sTime, eTime); |
|
|
|
Map<String, Integer> dataMap = new HashMap<>(); |
|
|
|
for (CUserDateAmountVo v : datas) { |
|
|
|
dataMap.put(v.getXTime(), v.getPrice()); |
|
|
|
|