From 4e1784b08107562a0c910ab8fa914f06b40cc34a Mon Sep 17 00:00:00 2001 From: xianpengcheng Date: Tue, 16 May 2023 11:15:56 +0800 Subject: [PATCH] 来源与报表统一为 60 --- fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java | 2 +- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java index a6d116e..5d392f8 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java @@ -24,7 +24,7 @@ public enum ValhallaReportDimension { /** * 来源 */ - D99("99"), + D60("60"), ; /** diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java index 8cd33fe..f048d8d 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java @@ -165,7 +165,7 @@ public class PublicReportBizService { }else { //不是1号的数据直接从上次抽取的数据中查询月初一的数据 List reportDataList = publicReportDataService.list(Wrappers.lambdaQuery() - .eq(PublicReportData::getReportDimension, ValhallaReportDimension.D99.getValue()) + .eq(PublicReportData::getReportDimension, ValhallaReportDimension.D60.getValue()) .eq(PublicReportData::getDataDate, startMonDate) ); if (!CollectionUtils.isEmpty(reportDataList)){ @@ -557,13 +557,13 @@ public class PublicReportBizService { private PublicReportData getPublicReportDataD99Increase(List publicReportData20List,PublicPoolReportDTO publicPoolReportDTO,Long groupId){ if (CollectionUtils.isEmpty(publicReportData20List)){ - return new PublicReportData(ValhallaReportDimension.D99.getValue(),groupId); + return new PublicReportData(ValhallaReportDimension.D60.getValue(),groupId); } Optional dataOptional = publicReportData20List.stream().filter(e -> publicPoolReportDTO.getType().equals(e.getType()) && publicPoolReportDTO.getShopId().equals(e.getShopId())).findFirst(); if (dataOptional.isPresent()){ return dataOptional.get(); } - return new PublicReportData(ValhallaReportDimension.D99.getValue(),groupId); + return new PublicReportData(ValhallaReportDimension.D60.getValue(),groupId); } private PublicReportData getPublicReportDataD10(List publicReportData20List,Long shopId,Long groupId){ -- libgit2 0.22.2