From ed4f07531b9cb0794e976a14cee3b591dec8d4f6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:22:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
index 0d01e8e..4e80ed1 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java
@@ -187,6 +187,10 @@
public PageDTO<CouponReceiveDetailVO> getReceiveDetail(MgtCouponReceiveQuery query) {
MemberDTO memberDTO = getMemberQueryParam(query);
Set<Long> memberIdSet = getMemberIdSet(memberDTO);
+ if ((StringUtils.isNotBlank(query.getNickname()) || StringUtils.isNotBlank(
+ query.getPhone())) && CollUtils.isEmpty(memberIdSet)) {
+ return PageDTO.empty(0L, 0L);
+ }
Page<CouponMember> page = couponMemberService.lambdaQuery()
.eq(StringUtils.isNotNull(query.getCouponStatus()),
CouponMember::getCouponStatus, query.getCouponStatus())
--
Gitblit v1.7.1