From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 14:43:59 +0800
Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券，发布的时候将已经发布的设置为下架，只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取，超过领取优惠券的话则不返回数据
---
src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
index 89b410b..e6d1697 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.List;
@Slf4j
@@ -77,6 +78,11 @@
if(ll != null && ll.size() > 0){
for(FlowerMarkupSpListDTO ss : ll){
ss.setPrice(getFinalPriceForPartner(dto.getPartnerId(), ss.getCategory(), ss.getFlowerId(), ss.getPrice(), ss.getLevel()));
+ BigDecimal fee = ss.getFee();
+ if (fee == null) {
+ fee = BigDecimal.ZERO;
+ }
+ ss.setSellPrice(ss.getPrice().add(fee));
}
}
@@ -90,6 +96,11 @@
if(ll != null && ll.size() > 0){
for(FlowerMarkupSpListDTO ss : ll){
ss.setPrice(getFinalPriceForPartner(dto.getPartnerId(), ss.getCategory(), ss.getFlowerId(), ss.getPrice(), ss.getLevel()));
+ BigDecimal fee = ss.getFee();
+ if (fee == null) {
+ fee = BigDecimal.ZERO;
+ }
+ ss.setSellPrice(ss.getPrice().add(fee));
}
}
--
Gitblit v1.9.3