From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb

---
 oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 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
new file mode 100644
index 0000000..1c54b2d
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderQueryCriteria.java
@@ -0,0 +1,54 @@
+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
+ **/
+@Data
+public class OrderQueryCriteria {
+
+    @ApiModelProperty(value = "页码", example = "1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页数据量", example = "10")
+    private Integer size = 10;
+
+    @ApiModelProperty(value = "模糊查询(订单号、用户账号、描述、商品编号、条形码、商品名称、商品标题、商品描述)")
+    private String blurry;
+
+    @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 = "描述模糊查询")
+    private String orderDescribe;
+
+    @ApiModelProperty(value = "支付状态")
+    private String payState;
+
+    @ApiModelProperty(value = "支付类型")
+    private String payType;
+    private List<String> payTime;
+    private List<Timestamp> createTime;
+
+    @ApiModelProperty(value = "偏移量", hidden = true)
+    private long offset;
+}

--
Gitblit v1.9.3