|
|
@@ -406,6 +406,18 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 机构ID集合
|
|
|
+ List<Long> tenantIds = records.stream().map(UserOrderVo::getTenantId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
|
|
|
+
|
|
|
+ Map<Long, TenantInfo> tenantInfoMap = tenantInfoService.getMapByIds(tenantIds);
|
|
|
+ for (UserOrderVo record : records) {
|
|
|
+ TenantInfo tenantInfo = tenantInfoMap.get(record.getTenantId());
|
|
|
+ if (tenantInfo != null) {
|
|
|
+ record.setTenantName(tenantInfo.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
// 订单ID集合
|
|
|
List<String> orderNos = records.stream().map(UserOrder::getOrderNo).collect(Collectors.toList());
|
|
|
List<UserOrderDetailVo> detailVoList = getUserOrderDetailVos(orderNos);
|
