From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponServiceImpl.java | 11 +++++------
1 files changed, 5 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 4e80ed1..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
@@ -213,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;
@@ -243,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