From b8abd1c4081c2c67c1f258b9956f4c60652d831d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 17:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java
index 5756133..2aa9c7e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageList.java
@@ -15,29 +15,32 @@
* @Date 2024/12/12 17:29
*/
@Data
-@ApiModel
+@ApiModel(value = "订单列表查询query")
public class OrderPageList extends BasePage {
@ApiModelProperty("订单编号")
- public String code;
- @ApiModelProperty("下单用户")
- private String userName;
+ public String orderNumber;
@ApiModelProperty("联系电话")
private String phone;
- @ApiModelProperty("商品类型（1=服务，2=单品-自提，3=单品-快递）")
- private Integer goodsType;
- @ApiModelProperty("支付方式（1=微信，2=余额，3=积分）")
- private Integer paymentType;
- @ApiModelProperty("订单状态（1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价）")
- private Integer status;
- @ApiModelProperty("开始时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("商品名称")
+ private String goodName;
+
+
+ @ApiModelProperty("所属店铺")
+ private String shopName;
+ @ApiModelProperty("支付方式（1=微信，3=积分，4=组合支付）")
+ private Integer payMethod;
+
+ @ApiModelProperty("订单状态（3待使用4已完成5已取消8已评价）")
+ private Integer orderStatus;
+
+ @ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
- @ApiModelProperty("结束时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+ @ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
-
- private Integer shopId;
- private List<Long> appUserIds;
+
+ List<Long> appUserIds;
+ List<Integer> shopIds;
}
--
Gitblit v1.7.1