From 4012d7c9e7991a86c86af7516559e9b3bce551ee Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期三, 11 九月 2024 08:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java | 16 ++++++++++++++++
src/main/java/com/mzl/flower/service/payment/OrderService.java | 2 ++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
index 9fe2a67..af3fa10 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
@@ -119,5 +119,21 @@
@ApiModelProperty(value = "领取后有效类型名称")
private String usageTimeTypeName;
+ /**
+ * 有效开始时间
+ */
+ @ApiModelProperty(value = "有效开始时间")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime effectiveStart;
+
+ /**
+ * 有效结束时间
+ */
+ @ApiModelProperty(value = "有效结束时间")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime effectiveEnd;
+
}
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..75a5177 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);
--
Gitblit v1.9.3