From 6f0cee21409ccd21a762fb3a3a46cec06f65b503 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 14:31:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml | 4 +++-
src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java | 2 ++
src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java | 10 +++++-----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
index decf1ae..5fc2324 100644
--- a/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java
@@ -121,6 +121,8 @@
@Override
public FlowerSaleStatisticVO getFlowerSaleStatistics(FlowerSaleDTO dto) {
+ dto.setCreateStartDate(parseLocalDateTime(dto.getCreateStartDateStr(), 17, 0, 0, -1));
+ dto.setCreateEndDate(parseLocalDateTime(dto.getCreateEndDateStr(), 17, 0, 0, 0));
return salesStatisticAnalysisMapper.getFlowerSaleStatistics(dto);
}
diff --git a/src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java b/src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java
index 6ea0674..e5cd1a4 100644
--- a/src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java
+++ b/src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java
@@ -37,11 +37,11 @@
for(FlowerCategory c : cLs){
addTask(flowerService, c.getId(), null);
- if(ls != null && ls.size() > 0){
- for(Partner p : ls){
- addTask(flowerService, c.getId(), p.getId());
- }
- }
+// if(ls != null && ls.size() > 0){
+// for(Partner p : ls){
+// addTask(flowerService, c.getId(), p.getId());
+// }
+// }
}
}
}
diff --git a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
index 099e184..c2334f9 100644
--- a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
@@ -69,7 +69,9 @@
AND oi.station_id = #{dto.stationId}
</if>
<if test="dto.flowerCategory != null">
- AND f.category = #{dto.flowerCategory}
+ AND ( f.category = #{dto.flowerCategory} or f.category in (
+ select id from t_flower_category where parent_id = #{dto.flowerCategory}
+ ))
</if>
<if test="dto.flowerLevel != null and dto.flowerLevel != ''">
AND oi.flower_level = #{dto.flowerLevel}
--
Gitblit v1.9.3