From 01564bcc18737e621138a97bf3a6a26d94b96c36 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 11 九月 2024 13:21:39 +0800
Subject: [PATCH] 如果发生退单的情况,数据应该清除,统计的应该是下单成功的订单

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 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 8f9210e..7ae63c5 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
@@ -9,6 +9,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class OrderDTO extends AbstractTransDTO {
@@ -135,4 +136,32 @@
 
     @ApiModelProperty(value = "支付单号")
     private String paymentTrId;
+
+    @ApiModelProperty(value = "积分商品列表")
+    private List<OrderPointGoodsListDTO> pointGoodsList;
+
+    @ApiModelProperty(value = "优惠券编码")
+    private String memberCouponCode;
+
+    @ApiModelProperty(value = "优惠券名称")
+    private String memberCouponName;
+
+    @ApiModelProperty(value = "优惠券金额")
+    private BigDecimal memberCouponAmount;
+
+    @ApiModelProperty(value = "会员等级名称")
+    private String memberName;
+
+    @ApiModelProperty(value = "折扣类型(discount_type)")
+    @DictTrans(target = "memberDiscountTypeStr", codeType = "DISCOUNT_TYPE")
+    private String memberDiscountType;
+    private String memberDiscountTypeStr;
+
+    @ApiModelProperty(value = "会员折扣")
+    private BigDecimal memberDiscountRatio;
+
+    @ApiModelProperty(value = "优惠金额(每扎)")
+    private BigDecimal memberDiscountAmount;
+
+    private List<OrderItemListDTO> items;
 }

--
Gitblit v1.9.3