From 672637fa4a4914ec9667cb15f70b67482b8a0e5e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 25 九月 2025 17:16:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into user_action
---
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java | 9 +++++++--
1 files changed, 7 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 5075613..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
@@ -84,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;
@@ -119,6 +119,7 @@
private String couponFlag;
+ private String storeSelectId;
public <T> QueryWrapper<T> queryWrapper() {
AuthUser currentUser = UserContext.getCurrentUser();
@@ -128,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());
@@ -140,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);
--
Gitblit v1.8.0