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/payment/OrderSettlementService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
index 49100ed..02cb428 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
@@ -756,7 +756,7 @@
detail.setOrderId(oi.getOrderId());
detail.setOrderItemId(itemId);
- detail.setPrice(oi.getMarkupPartner());
+ detail.setPrice(getAmount(oi.getMarkupPartner()));
detail.setNum(oi.getNum());
detail.setTotalAmount(detail.getPrice().multiply(new BigDecimal(detail.getNum())));
detail.setCheckFee(new BigDecimal(0));
--
Gitblit v1.9.3