From a3daea7a022be8fde35b8c9af8aca7608f77624f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 Jan 2023 15:22:05 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
index d0907cb..c958d1e 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -21,9 +21,15 @@
     @ApiModelProperty(value = "搜索参数", example = "1")
     private String query;
 
-    @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
+    @ApiModelProperty(value = "订单全状态", example = "全部不用传 2-进行中 3-已完成")
+    private Integer allStatus;
+
+    @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-已完成 5-已取消")
     private Integer status;
 
     @ApiModelProperty(hidden = true)
     private Long memberId;
+
+    @ApiModelProperty(value = "1-普通订单, 2-积分订单", example = "1")
+    private Integer orderType;
 }

--
Gitblit v1.9.1