From 89f8237e343d2b59dbf280c055751b69ee32f01d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 18:04:52 +0800
Subject: [PATCH] 1.日历功能
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 986d187..54c79fb 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -444,6 +444,7 @@
BigDecimal totalAmount = order.getFlowerAmount().add(p.getPacking()).add(transportFee);//使用优惠券之前的总价
CouponRecordDO coupon = useCouponRecord(order.getId(), totalAmount, dto.getCouponRecordId());
+ log.info("用户优惠券: " + coupon);
if(coupon != null){
order.setMemberCouponId(coupon.getId());
order.setMemberCouponCode(coupon.getCouponCode());
@@ -563,6 +564,7 @@
}
private CouponRecordDO useCouponRecord(String orderId, BigDecimal amount, String couponRecordId){
+ log.info("使用用户优惠券id: " + couponRecordId + "; 订单id: " + orderId);
if(StringUtils.isNotEmpty(couponRecordId)){
//优惠券使用和验证，如果不符合使用条件需要抛出异常。需调用优惠券使用方法
couponRecordService.useCoupon(couponRecordId, orderId, amount);
@@ -908,6 +910,13 @@
result.add(llc);
}
+
+ BigDecimal t = llc.getTotalAmount();
+ if(t == null){
+ t = new BigDecimal(0);
+ }
+ t = t.add(c.getTotalAmount());
+ llc.setTotalAmount(t);
}
Map<Long, String> stationMap = prepareStationMap();
--
Gitblit v1.9.3