From fcf92d335a32ec572337247431b4bd17752cb64d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 23 九月 2024 14:34:13 +0800
Subject: [PATCH] add：订单详情页面增加优惠券类型、使用条件
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 11 +++++++++++
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 8 ++++++++
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
index 7ae63c5..b2a330e 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java
@@ -164,4 +164,12 @@
private BigDecimal memberDiscountAmount;
private List<OrderItemListDTO> items;
+
+ @ApiModelProperty(value = "优惠券类型（discount_type）")
+ @DictTrans(target = "couponDiscountTypeName",codeType = "COUPON_TYPE")
+ private String couponDiscountType;
+ private String couponDiscountTypeName;
+
+ @ApiModelProperty(value = " 使用条件（满多少钱）")
+ private String minOrderAmount;
}
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 770572e..34d6b5b 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -14,6 +14,7 @@
import com.mzl.flower.dto.PriceDTO;
import com.mzl.flower.dto.request.menber.MemberGrowthRecordDTO;
import com.mzl.flower.dto.request.payment.*;
+import com.mzl.flower.dto.response.coupon.CouponRecordVO;
import com.mzl.flower.dto.response.flower.FlowerCartListDTO;
import com.mzl.flower.dto.response.flower.FlowerCartListWrapDTO;
import com.mzl.flower.dto.response.flower.FlowerDTO;
@@ -60,6 +61,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -1099,6 +1101,15 @@
List<OrderPointGoodsListDTO> pointGoodsList = orderMapper.getPointGoodsList(id);
dto.setPointGoodsList(pointGoodsList);
+ //判断优惠券ID是否为空 用户优惠券id
+ if(StringUtils.isNotBlank(o.getMemberCouponId())){
+ CouponRecordVO couponRecordVO = couponRecordService.getCouponRecordById(o.getMemberCouponId());
+ if(!ObjectUtils.isEmpty(couponRecordVO)){
+ dto.setCouponDiscountType(couponRecordVO.getCouponDiscountType());
+ dto.setMinOrderAmount("满"+couponRecordVO.getMinOrderAmount());
+ }
+ }
+
return dto;
}
--
Gitblit v1.9.3