From 8f93dec4001d0c6f526d324fe12bc0a7f94b2e88 Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Thu, 28 Dec 2023 11:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BC=9A=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=B5=81=E6=B0=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/model/stats/HallLaborStats.java | 4 ++++ .../accompany/admin/vo/stats/LaborStatsVo.java | 3 +++ .../admin/mapper/LaborStatsMapper.java | 2 ++ .../statistic/LaborStatsAdminService.java | 16 ++++++++++++++++ .../stats/impl/HallLaborStatsServiceImpl.java | 1 + .../main/resources/mapper/LaborStatsMapper.xml | 18 ++++++++++++++++++ .../statistic/StatsAdminController.java | 2 +- 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/stats/HallLaborStats.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/stats/HallLaborStats.java index 9a490ef97..4e013161f 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/stats/HallLaborStats.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/stats/HallLaborStats.java @@ -1,5 +1,6 @@ package com.accompany.admin.model.stats; +import com.accompany.common.annotation.FieldComment; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -52,4 +53,7 @@ public class HallLaborStats { @ApiModelProperty("新用户送礼人数") public Integer newUserSendGift; + @ApiModelProperty("新用户送礼流水") + private Integer newUserSendGiftAmount; + } diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/stats/LaborStatsVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/stats/LaborStatsVo.java index e2f04c837..3b9cac7db 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/stats/LaborStatsVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/stats/LaborStatsVo.java @@ -37,6 +37,9 @@ public class LaborStatsVo extends BaseVo { // 新用户（当日注册）送礼人数 @FieldComment("新用户送礼人数") public Integer newUserSendGift; + // 新用户送礼流水 + @FieldComment("新用户送礼流水") + private Integer newUserSendGiftAmount; } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LaborStatsMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LaborStatsMapper.java index 9f1c29b62..1e90a9c54 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LaborStatsMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/LaborStatsMapper.java @@ -45,5 +45,7 @@ public interface LaborStatsMapper { List getCountNewUserInRoom(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("roomUidList") List roomUidList); List getCountNewUserSendGift(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("roomUidList") List roomUidList); + + List getNewUserSendGiftAmount(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("roomUidList") List roomUidList); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java index b1e14dfbc..570342372 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/LaborStatsAdminService.java @@ -162,6 +162,11 @@ public class LaborStatsAdminService extends BaseService { if (newUserSendGiftRecords == null) { newUserSendGiftRecords = Collections.emptyList(); } + //新用户送礼流水 + List newUserSendGiftAmountRecords = laborStatsMapper.getNewUserSendGiftAmount(beginTimeOfDay, endTimeOfDay, roomUidList); + if (newUserSendGiftAmountRecords == null) { + newUserSendGiftAmountRecords = Collections.emptyList(); + } Map> firstInRoomUserMap = firstInRoomRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); Map> totalInRoomUserMap = totalInRoomRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); Map> firstInRoomGiftUserMap = firstInRoomGiftUserRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); @@ -171,6 +176,7 @@ public class LaborStatsAdminService extends BaseService { Map> roomBackpackRevenueMap = roomBackpackRevenueRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); Map> newUserInRoomMap = newUserInRoomRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); Map> newUserSendGiftMap = newUserSendGiftRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); + Map> newUserSendGiftAmountMap = newUserSendGiftAmountRecords.stream().collect(Collectors.groupingBy(LaborStatsDto::getDate)); while (DateTimeUtil.compareTime(endTime, dateTime) >= 0) { for (String erBanNo : erBanNoArray) { String dateStr = DateTimeUtil.convertDate(dateTime, DateTimeUtil.DEFAULT_DATE_PATTERN); @@ -280,6 +286,16 @@ public class LaborStatsAdminService extends BaseService { } } stats.setNewUserSendGift(newUserSendGift); + //新用户送礼流水 + int newUserSendGiftAmount = 0; + List newUserSendGiftAmounts = newUserSendGiftAmountMap.get(dateStr); + if (newUserSendGiftAmounts != null) { + Optional any = newUserSendGiftAmounts.stream().filter(v -> v.getRoomUid().equals(roomUid)).findAny(); + if (any.isPresent()) { + newUserSendGiftAmount = any.get().getStatsCount(); + } + } + stats.setNewUserSendGiftAmount(newUserSendGiftAmount); data.add(stats); } dateTime = DateTimeUtil.addDays(dateTime, 1); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/stats/impl/HallLaborStatsServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/stats/impl/HallLaborStatsServiceImpl.java index ce20c2923..365daf522 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/stats/impl/HallLaborStatsServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/stats/impl/HallLaborStatsServiceImpl.java @@ -111,6 +111,7 @@ public class HallLaborStatsServiceImpl extends ServiceImpl group by gsr.room_uid, date + + \ No newline at end of file diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsAdminController.java index 89b33dbf0..05dd525fc 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/statistic/StatsAdminController.java @@ -114,7 +114,7 @@ public class StatsAdminController extends BaseController { String filename = "laborExport"; List fields = Arrays.asList("date", "erbanNo", "roomTitle", "firstInRoom", "firstInRoomRetained", "totalInRoom", "firstInRoomGiftUser", "giftUser", "roomRevenue", "roomNormalRevenue", - "roomBackpackRevenue", "firstInRoomGiftRate", "newUserInRoom", "newUserSendGift"); + "roomBackpackRevenue", "firstInRoomGiftRate", "newUserInRoom", "newUserSendGift", "newUserSendGiftAmount"); ExcelUtils.exportExcel("公会统计", filename, fields, busiResult.getData(), response); }