From f27bfd01251ea5ff742f0ad175b88c0c16bd5c8c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 06 九月 2024 11:58:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerService.java b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
index e724dcd..98451a5 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/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);
+
+ }
+
+ }
}
--
Gitblit v1.9.3