From 206f601b1f2a2e3cb0bf4f5dead01bec9077d8e9 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 04 Sep 2025 15:28:52 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java
index cb32e5d..1c54b2d 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java
@@ -1,16 +1,18 @@
package com.oying.modules.sh.domain.dto;
import lombok.Data;
+
import java.sql.Timestamp;
import java.util.List;
+
import io.swagger.annotations.ApiModelProperty;
/**
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @date 2025-06-11
+ **/
@Data
-public class OrderQueryCriteria{
+public class OrderQueryCriteria {
@ApiModelProperty(value = "页码", example = "1")
private Integer page = 1;
@@ -18,19 +20,25 @@
@ApiModelProperty(value = "每页数据量", example = "10")
private Integer size = 10;
- @ApiModelProperty(value = "订单状态")
- private Integer orderStatus;
+ @ApiModelProperty(value = "模糊查询（订单号、用户账号、描述、商品编号、条形码、商品名称、商品标题、商品描述）")
+ private String blurry;
- @ApiModelProperty(value = "订单号")
+ @ApiModelProperty(value = "订单状态")
+ private List<Integer> orderStatus;
+
+ @ApiModelProperty(value = "订单号模糊查询")
private String orderNum;
@ApiModelProperty(value = "用户id")
private Long userId;
+ @ApiModelProperty(value = "用户账号模糊查询")
+ private String username;
+
@ApiModelProperty(value = "门店ID")
private Long storeId;
- @ApiModelProperty(value = "描述")
+ @ApiModelProperty(value = "描述模糊查询")
private String orderDescribe;
@ApiModelProperty(value = "支付状态")
@@ -40,4 +48,7 @@
private String payType;
private List<String> payTime;
private List<Timestamp> createTime;
+
+ @ApiModelProperty(value = "偏移量", hidden = true)
+ private long offset;
}
--
Gitblit v1.9.3