来源与报表统一为 60

xianpengcheng
1 parent d8ddee37
Showing 2 changed files with 4 additions and 4 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/ValhallaReportDimension.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/report/PublicReportBizService.java
@@ -24,7 +24,7 @@ public enum ValhallaReportDimension {
     /**
      * 来源
      */
-    D99("99"),
+    D60("60"),
     ;
  
     /**
@@ -165,7 +165,7 @@ public class PublicReportBizService {
         }else {
             //不是1号的数据直接从上次抽取的数据中查询月初一的数据
             List<PublicReportData> reportDataList = publicReportDataService.list(Wrappers.<PublicReportData>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<PublicReportData> publicReportData20List,PublicPoolReportDTO publicPoolReportDTO,Long groupId){
         if (CollectionUtils.isEmpty(publicReportData20List)){
-            return new PublicReportData(ValhallaReportDimension.D99.getValue(),groupId);
+            return new PublicReportData(ValhallaReportDimension.D60.getValue(),groupId);
         }
         Optional<PublicReportData> 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<PublicReportData> publicReportData20List,Long shopId,Long groupId){