From 9615ef3023e1a60d202e86178003a2b864191106 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:10:00 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 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 fb43104..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
@@ -137,5 +137,39 @@
@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;
+
+ @ApiModelProperty(value = "优惠券类型（discount_type）")
+ @DictTrans(target = "couponDiscountTypeName",codeType = "COUPON_TYPE")
+ private String couponDiscountType;
+ private String couponDiscountTypeName;
+
+ @ApiModelProperty(value = " 使用条件（满多少钱）")
+ private String minOrderAmount;
}
--
Gitblit v1.9.3