From c7d127ae867c00f01a7eb4977836565bcae6ee9f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:29:56 +0800
Subject: [PATCH] 1.财务报表-部分统计字段新增 2.合伙人报表-部分统计字段新增
---
src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
index 41f590e..2cbfd39 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
@@ -122,6 +122,10 @@
return dto;
}
+ public List<FlowerCategoryTreeDTO> selectCategoryList(FlowerCategoryQueryDTO dto){
+ return categoryMapper.selectCategoryList(dto);
+ }
+
public List<FlowerCategoryTreeDTO> selectCategoryTree(FlowerCategoryQueryDTO dto) {
List<FlowerCategoryTreeDTO> treeList = categoryMapper.selectTreeList(dto);
treeList = (List<FlowerCategoryTreeDTO>) TreeBuilderUtil.buildListToTree(treeList);
@@ -200,11 +204,11 @@
BigDecimal priceHigh = null;
for (Flower f : ls) {
BigDecimal price = getFinalPrice(partnerId, categoryId, f.getId(), f.getPrice(), f.getLevel());
- if(priceLow == null || priceLow.doubleValue() > price.doubleValue()){
+ if(priceLow == null || priceLow.compareTo(price) > 0){
priceLow = price;
}
- if(priceHigh == null || priceHigh.doubleValue() < price.doubleValue()){
+ if(priceHigh == null || priceHigh.compareTo(price) < 0){
priceHigh = price;
}
}
--
Gitblit v1.9.3