From bd375f4fe8081c0ca612d72ed06c47ab3f89d68d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb'
---
oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
new file mode 100644
index 0000000..a259522
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
@@ -0,0 +1,43 @@
+package com.oying.modules.rider.domain.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.util.List;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+* @author pxb
+* @date 2025-06-18
+**/
+@Data
+public class RiderIncomeDetailQueryCriteria{
+
+ @ApiModelProperty(value = "页码", example = "1")
+ private Integer page = 1;
+
+ @ApiModelProperty(value = "每页数据量", example = "10")
+ private Integer size = 10;
+
+ @ApiModelProperty(value = "骑手名字")
+ private String riderName;
+
+ @ApiModelProperty(value = "骑手手机号")
+ private String riderPhone;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @ApiModelProperty(value = "收入类型：1-配送费，2-奖励，3-补贴")
+ private String incomeType;
+
+ @ApiModelProperty(value = "收入日期(YYYY-MM-dd)方便统计")
+ private String incomeDate;
+
+ @ApiModelProperty(value = "收入月份YYYY-MM")
+ private String incomeMonth;
+
+ @ApiModelProperty(value = "订单状态：1-待取货，2-配送中，3-已完成，4-已取消")
+ private String orderStatus;
+
+ private List<Timestamp> createTime;
+}
--
Gitblit v1.9.3