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

cloudroam

2024-09-06 f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c

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

@@ -498,7 +498,7 @@
        Member member = getMember(levelId);

        BigDecimal price = getFinalPrice(pId, dto.getCategory()
                , s.getId(), dto.getPrice(), dto.getLevel());
                , dto.getId(), dto.getPrice(), dto.getLevel());
        dto.setPrice(price);
        dto.setPriceMember(calculateMemberPrice(price, member));

@@ -720,4 +720,14 @@

        return page;
    }

    public void clearInvalidHistory(String userId) {

        List<Long> ids = flowerMapper.searchInvalidHistory(userId);
        if(ids!=null && ids.size()>0){
            browseService.deleteBatchIds(ids);

        }

    }
}