From 36ca968755d48a60a7292a1a90e38b00bdf75536 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 18 九月 2025 14:44:06 +0800
Subject: [PATCH] 订单列表导出支持年月日时分秒
---
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index 0bae393..87e1e94 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -53,6 +53,8 @@
@ApiModelProperty(value = "涔板鏄电О")
private String buyerName;
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+ private String nickName;
@ApiModelProperty(value = "璁㈠崟鐘舵��")
private String orderStatus;
@@ -82,12 +84,12 @@
private Date paymentTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "涓嬪崟寮�濮嬫椂闂�")
private Date startDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "涓嬪崟缁撴潫鏃堕棿")
private Date endDate;
@@ -114,6 +116,9 @@
*/
@ApiModelProperty(value = "璁㈠崟淇冮攢绫诲瀷")
private String orderPromotionType;
+
+ private String couponFlag;
+
public <T> QueryWrapper<T> queryWrapper() {
AuthUser currentUser = UserContext.getCurrentUser();
@@ -172,9 +177,14 @@
//璁㈠崟鏉ユ簮
wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType);
+ //鐢ㄦ埛鏄电О
+ wrapper.like(CharSequenceUtil.isNotEmpty(nickName),"m.nick_name",nickName);
+
//鎸夎瘎浠风姸鎬�
wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus);
+ wrapper.eq(CharSequenceUtil.isNotEmpty(couponFlag),"o.coupon_flag", couponFlag);
+
//鎸夋爣绛炬煡璇�
if (CharSequenceUtil.isNotEmpty(tag)) {
String orderStatusColumn = "o.order_status";
--
Gitblit v1.8.0