Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

 src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java

@@ -204,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;
                }
            }