From 85e8510c6655eaa91000307248391bb81c10310e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Sep 2025 13:56:58 +0800
Subject: [PATCH] refactor(mall): 重构活动订单接口
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index eba557d..c15fac4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -519,17 +519,8 @@
Set<Long> orderIds = happyActivityOrders.stream().map(HappyActivityOrder::getId).collect(Collectors.toSet());
List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
new LambdaQueryWrapper<HappyActivityOrderItem>()
- .select(HappyActivityOrderItem::getConnectId)
.in(HappyActivityOrderItem::getOrderId, orderIds)
);
- Set<Long> connectIds = happyActivityOrderItems.stream().map(HappyActivityOrderItem::getConnectId).collect(Collectors.toSet());
- List<HappyActivityConnect> happyActivityConnects = happyActivityConnectMapper.selectList(
- new LambdaQueryWrapper<HappyActivityConnect>()
- .select(HappyActivityConnect::getId,HappyActivityConnect::getName,HappyActivityConnect::getPhone,HappyActivityConnect::getAddress)
- .in(HappyActivityConnect::getId, connectIds)
- );
- Map<Long, HappyActivityConnect> happyActivityConnectMap = happyActivityConnects.stream().collect(Collectors.toMap(HappyActivityConnect::getId, happyActivityConnect -> happyActivityConnect));
-
Set<Long> collect = happyActivityOrders.stream().map(HappyActivityOrder::getMemberId).collect(Collectors.toSet());
List<MallMember> mallMembers = mallMemberMapper.selectList(
@@ -539,12 +530,11 @@
);
Map<Long, MallMember> mallMemberMap = mallMembers.stream().collect(Collectors.toMap(MallMember::getId, mallMember -> mallMember));
- happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ for (HappyActivityOrderItem happyActivityOrderItem : happyActivityOrderItems){
AdminHappyActivityOrderItemVo vo = new AdminHappyActivityOrderItemVo();
- HappyActivityConnect happyActivityConnect = happyActivityConnectMap.get(happyActivityOrderItem.getConnectId());
- vo.setConnectName(happyActivityConnect.getName());
- vo.setConnectPhone(happyActivityConnect.getPhone());
- vo.setConnectAddress(happyActivityConnect.getAddress());
+ vo.setConnectName(happyActivityOrderItem.getName());
+ vo.setConnectPhone(happyActivityOrderItem.getPhone());
+ vo.setConnectAddress(happyActivityOrderItem.getAddress());
HappyActivityOrder happyActivityOrder = happyActivityOrderMap.get(happyActivityOrderItem.getOrderId());
vo.setId(happyActivityOrder.getId());
@@ -569,7 +559,8 @@
}else{
vo.setMemberName("");
}
- });
+ list.add(vo);
+ }
}
return list;
}
--
Gitblit v1.9.1