From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..0cd5900 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())
@@ -209,7 +213,7 @@
List<CouponReceiveDetailVO> usedCouponList = couponReceiveDetailVOList.stream()
.filter(item -> item.getCouponStatus().equals(
CouponUseEnum.USED)).collect(Collectors.toList());
- Set<Long> couponIdSet = usedCouponList.stream().map(CouponReceiveDetailVO::getCouponId)
+ Set<Long> couponIdSet = usedCouponList.stream().map(CouponReceiveDetailVO::getId)
.collect(Collectors.toSet());
Map<String, Order> orderMap = null;
Map<Long, Member> memberMap = null;
@@ -239,15 +243,14 @@
couponReceiveDetailVO.setNickname(member.getNickname());
couponReceiveDetailVO.setPhone(member.getPhone());
}
- } else if (StringUtils.isNotEmpty(orderMap)) {
- Order order = orderMap.get(couponReceiveDetailVO.getCouponId() + "-"
+ }
+ if (StringUtils.isNotEmpty(orderMap)) {
+ Order order = orderMap.get(couponReceiveDetailVO.getId() + "-"
+ couponReceiveDetailVO.getMemberId());
if (StringUtils.isNotNull(order)) {
couponReceiveDetailVO.setOrderNo(order.getOrderNo());
- couponReceiveDetailVO.setCreateTime(order.getCreateTime());
+ couponReceiveDetailVO.setUseTime(order.getCreateTime());
}
- } else {
- break;
}
}
}
--
Gitblit v1.7.1