flowerbackend-v2.git

			@@ -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);
			}

			@@ -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());
			// }
			// }
			}
			}
			}

			@@ -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}

	src/main/java/com/mzl/flower/service/impl/statisticsAnalysis/StatisticAnalysisServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/thread/FlowerCategoryPriceThread.java	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史