From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计,将原销售扎数改成实际销售扎数

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java |   10 ++++++++++
 1 files changed, 10 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 5b64837..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
@@ -162,4 +162,14 @@
 
     @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