|
@@ -343,21 +343,10 @@ public class OrderDeliverServiceImpl extends ServiceImpl<OrderDeliverMapper, Ord
|
|
|
.map(OrderMain::getId)
|
|
.map(OrderMain::getId)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
|
|
- // 构建 orderId -> totalAmount 映射
|
|
|
|
|
- Map<Long, BigDecimal> orderIdToAmountMap = orderMainList.stream()
|
|
|
|
|
- .collect(Collectors.toMap(
|
|
|
|
|
- OrderMain::getId,
|
|
|
|
|
- OrderMain::getTotalAmount,
|
|
|
|
|
- (v1, v2) -> v1
|
|
|
|
|
- ));
|
|
|
|
|
-
|
|
|
|
|
- // 构建 orderId -> orderTime 映射
|
|
|
|
|
- Map<Long, Date> orderIdToorderTimeMap = orderMainList.stream()
|
|
|
|
|
- .collect(Collectors.toMap(
|
|
|
|
|
- OrderMain::getId,
|
|
|
|
|
- OrderMain::getOrderTime,
|
|
|
|
|
- (v1, v2) -> v1
|
|
|
|
|
- ));
|
|
|
|
|
|
|
+ Map<Long, Date> orderIdToorderTimeMap = new HashMap<>();
|
|
|
|
|
+ for (OrderMain order : orderMainList) {
|
|
|
|
|
+ orderIdToorderTimeMap.put(order.getId(), order.getOrderTime());
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
Set<Long> createUserIds = orderMainList.stream().map(OrderMain::getCreateBy).collect(Collectors.toSet());
|
|
Set<Long> createUserIds = orderMainList.stream().map(OrderMain::getCreateBy).collect(Collectors.toSet());
|
|
|
Set<Long> createDeptIds = orderMainList.stream().map(OrderMain::getCreateDept).collect(Collectors.toSet());
|
|
Set<Long> createDeptIds = orderMainList.stream().map(OrderMain::getCreateDept).collect(Collectors.toSet());
|