From fa27fd4a21e04352a97988c153b7709ebecc4e89 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:33 +0800
Subject: [PATCH] 处理bug
---
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 87e1e94..f45bea4 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
@@ -119,6 +119,9 @@
private String couponFlag;
+ private String customizeFlag;
+
+ private String storeSelectId;
public <T> QueryWrapper<T> queryWrapper() {
AuthUser currentUser = UserContext.getCurrentUser();
@@ -128,6 +131,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());
@@ -140,6 +144,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);
@@ -184,6 +191,7 @@
wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus);
wrapper.eq(CharSequenceUtil.isNotEmpty(couponFlag),"o.coupon_flag", couponFlag);
+ wrapper.eq(CharSequenceUtil.isNotEmpty(customizeFlag),"o.customize_flag", customizeFlag);
//鎸夋爣绛炬煡璇�
if (CharSequenceUtil.isNotEmpty(tag)) {
--
Gitblit v1.8.0