From 092e1895006b688ea8d71278d9fa39b1be7f61ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 17:27:19 +0800
Subject: [PATCH] 订单代码上移到controller
---
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java | 19 +++++++++++++++++--
1 files changed, 17 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..898cfaf 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;
@@ -115,6 +117,10 @@
@ApiModelProperty(value = "璁㈠崟淇冮攢绫诲瀷")
private String orderPromotionType;
+ private String couponFlag;
+
+ private String storeSelectId;
+
public <T> QueryWrapper<T> queryWrapper() {
AuthUser currentUser = UserContext.getCurrentUser();
QueryWrapper<T> wrapper = new QueryWrapper<>();
@@ -123,6 +129,7 @@
if (CharSequenceUtil.isNotEmpty(keywords)) {
wrapper.and(keyWrapper -> keyWrapper.like("o.sn", keywords).or().like("oi.goods_name", keywords));
}
+ //鏇村叿瑙掕壊鏌ヨ鐨�
if (currentUser != null) {
//鎸夊崠瀹舵煡璇�
wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.STORE.name()), "o.store_id", currentUser.getStoreId());
@@ -135,6 +142,9 @@
wrapper.eq(CharSequenceUtil.equals(currentUser.getRole().name(), UserEnums.MEMBER.name()) && memberId == null, "o.member_id", currentUser.getId());
}
+ //鎸変笅鎷夋閫夋嫨鏌ヨ
+ wrapper.eq(CharSequenceUtil.isNotEmpty(storeSelectId), "o.store_id", storeSelectId);
+
//鎸夌収涔板鏌ヨ
wrapper.like(CharSequenceUtil.isNotEmpty(memberId), "o.member_id", memberId);
@@ -172,9 +182,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