From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:31:12 +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/request/payment/OrderItemSalesQueryDTO.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
index 4b402bc..d69bd85 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
@@ -5,11 +5,15 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class OrderItemSalesQueryDTO implements Serializable {
@ApiModelProperty(value = "订单id")
private String orderId;
+
+ @ApiModelProperty(value = "订单商品id")
+ private String orderItemId;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@@ -29,16 +33,16 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
- @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd")
private String orderStartDateStr;
- @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd")
private String orderEndDateStr;
- @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd")
private String salesStartDateStr;
- @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd")
private String salesEndDateStr;
@ApiModelProperty(value = "状态 ORDER_SALES_STATUS")
@@ -64,4 +68,8 @@
@ApiModelProperty(hidden = true)
private LocalDateTime salesEndDate;
+
+ private String salesType;//售后类型
+
+ private List<String> statusList;
}
--
Gitblit v1.9.3