From 15e98ba6f24934ab8733619db9d8f22e3ab5d07f Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 14 Jan 2022 16:21:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/MarkingDataReportController.java | 10 ++-- .../dto/MarkingCouponDataReportDto.java | 2 + .../iformall/mapper/WxCouponOrderMapper.java | 2 +- .../impl/MarkingDataReportServiceImpl.java | 15 +++--- .../service/impl/WxChartServiceImpl.java | 4 +- .../resources/mapper/WxCouponOrderMapper.xml | 51 +++++-------------- 6 files changed, 32 insertions(+), 52 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index b4f73e4d5..8dbc0324f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -92,9 +92,10 @@ public class MarkingDataReportController extends BaseController { public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersDataList"); TenantEntity tenantInfo = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); - markingCouponDataReportDto.setTenantEntitys(tenantEntitys); + //List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); + //markingCouponDataReportDto.setTenantEntitys(tenantEntitys); markingCouponDataReportDto.updateTenantInfo(tenantInfo); + markingCouponDataReportDto.setTenantEntity(tenantInfo); return new ResultData(markingDataReportService.getTouchUsersReportList(markingCouponDataReportDto, pageNum, pageSize)); } @@ -103,9 +104,10 @@ public class MarkingDataReportController extends BaseController { @SystemControllerLog(description = "券数据-触达用户数数据导出") public void exportTouchUsersData(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, HttpServletRequest request, HttpServletResponse response) { TenantEntity tenantInfo = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); - markingCouponDataReportDto.setTenantEntitys(tenantEntitys); + //List tenantEntitys = wxMallService.getTenantEntitys(tenantInfo); + //markingCouponDataReportDto.setTenantEntitys(tenantEntitys); markingCouponDataReportDto.updateTenantInfo(tenantInfo); + markingCouponDataReportDto.setTenantEntity(tenantInfo); markingDataReportService.exportTouchUsersData(request, response, markingCouponDataReportDto); } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java index 947668291..4d3173d61 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/MarkingCouponDataReportDto.java @@ -27,6 +27,8 @@ public class MarkingCouponDataReportDto extends TenantEntity { @TableField(exist = false) private List tenantEntitys; + @TableField(exist = false) + private TenantEntity tenantEntity; @TableField(exist = false) @SortColumn(column = "xTime") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index ffd01ef62..52a36e9d7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -82,7 +82,7 @@ public interface WxCouponOrderMapper extends CommonMapper { List queryForSceneRepotyHistoryVerified(HashMap params); List queryForSceneRepotyHistoryOrdered(HashMap params); - List queryForSceneRepotyMechantHistoryOrdered(HashMap params); + //List queryForSceneRepotyMechantHistoryOrdered(HashMap params); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index e325a5f34..a8dde836d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -309,6 +309,7 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { params.put("parentTenantId", tenantEntity.getParentTenantId()); } + params.put("tenantEntity", tenantEntity); if (markingCouponDataReportDto.getStartTime() != null) params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(), 0)); if (markingCouponDataReportDto.getEndTime() != null) @@ -491,13 +492,13 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); }else if (markingCouponDataReportDto.getType().equals(EnumCouponSendSendType.MERCHANT.getCode())) { //购买发券数 - if (markingCouponDataReportDto.getStartTime() != null) - params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); - if (markingCouponDataReportDto.getEndTime() != null) - params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); - params.put("channelType", markingCouponDataReportDto.getType()); - List markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyMechantHistoryOrdered(params); - triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); +// if (markingCouponDataReportDto.getStartTime() != null) +// params.put("startTime", convertDateAndAdd(markingCouponDataReportDto.getStartTime(),0)); +// if (markingCouponDataReportDto.getEndTime() != null) +// params.put("endTime", convertDateAndAdd(markingCouponDataReportDto.getEndTime(), 1)); +// params.put("channelType", markingCouponDataReportDto.getType()); +// List markingSceneDataVos = wxCouponOrderMapper.queryForSceneRepotyMechantHistoryOrdered(params); +// triggerCountMap = markingSceneDataVos.stream().collect(Collectors.toMap(MarkingSceneDataVo::getXtime, p -> p.getTriggerCount())); } NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); 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 44d90ab30..1debcea61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1456,9 +1456,7 @@ public class WxChartServiceImpl implements WxChartDataService { wxCouponOrder.setStartTime(startTime); wxCouponOrder.setEndTime(endTime); // wxCouponOrder.updateTenantInfo(tenantEntity); - //TODO 待优化数据 - //int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys);//月消费金额 - int thisMonthCount = 0; + int thisMonthCount = wxCouponOrderService.queryPriceTotal(wxCouponOrder,tenantEntitys);//月消费金额 c.clear(); c.add(Calendar.DAY_OF_YEAR, -1); c.set(Calendar.HOUR_OF_DAY, 0); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index fcd96cc58..6540bef92 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -343,13 +343,7 @@ SELECT xTime, sum(pv) pv, sum(uv) uv, sum(couponCount) couponCount, sum(userCount) userCount, sum(verifyCount) verifyCount, sum(verifyUserCount) verifyUserCount - FROM ( - SELECT * from view_touch_user${tenantEntity.shardTableSuffix} WHERE `tenant_id` = #{tenantEntity.tenantId} - ) view_touch_user - WHERE 1=1 - - and `tenant_id` = #{tenantId} - + from view_touch_user${tenantEntity.shardTableSuffix} WHERE `tenant_id` = #{tenantEntity.tenantId} and `parent_tenant_id` = #{parentTenantId} @@ -395,9 +383,7 @@ select DATE_FORMAT(update_date,'%Y-%m-%d') xTime, count(c.id) triggerCount - from ( - SELECT * from wx_coupon_order${tenantEntity.shardTableSuffix} - ) c - where 1=1 - - and c.`tenant_id` = #{tenantId} - + from wx_coupon_order c where c.`tenant_id` = #{tenantId} and c.`parent_tenant_id` = #{parentTenantId} @@ -429,13 +409,13 @@ group by xTime - SELECT IFNULL(SUM(coupon_price),0) from wx_coupon_order - where 1=1 - - and `tenant_id` = #{tenantId} - + where `tenant_id` = #{tenantId} and `parent_tenant_id` = #{parentTenantId} @@ -474,10 +451,10 @@ and coupon_type = #{couponType} - and create_date >= #{startTime} + and create_date_times >= unix_timestamp(#{startTime})*1000 - and create_date <= #{endTime} + and create_date_times <= unix_timestamp(#{endTime})*1000