From 55db77e61e5a55c30dc19d599dadcfc1469c962e Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:13:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 9c63b20..98451a5 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -333,8 +333,6 @@
dto.setZoneName(String.join(",", zoneNameLs));
}
- //TODO 合伙人加价列表
-
return dto;
}
@@ -500,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));
@@ -722,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