From 2a35fbd30e613dcddcbafe8243e40625ce22416a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:25:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/service/flower/FlowerService.java |    2 +-
 1 files changed, 1 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 b28809a..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));
 

--
Gitblit v1.9.3