|
@@ -393,10 +393,18 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
|
|
dto.setUsername(usernameMap.get(userId));
|
|
dto.setUsername(usernameMap.get(userId));
|
|
}else{
|
|
}else{
|
|
|
|
|
|
- if(StringUtils.isNoneBlank(accessoriesId)){
|
|
|
|
- accessoriesId = StringUtils.removeEnd(accessoriesId, ",");
|
|
|
|
- dto.setAccessoriesName(goodsService.findGoodsByIds(accessoriesId).stream().map(Goods::getName).collect(Collectors.joining(",")));
|
|
|
|
- }
|
|
|
|
|
|
+ if (StringUtils.isNoneBlank(accessoriesId)) {
|
|
|
|
+ accessoriesId = StringUtils.removeEnd(accessoriesId, ",");
|
|
|
|
+ Map<Integer, Goods> goodsMap = goodsService.findGoodsByIds(accessoriesId).stream().collect(Collectors.toMap(Goods::getId, Goods -> Goods));
|
|
|
|
+
|
|
|
|
+ String[] accessoriesIds = StringUtils.split(accessoriesId, ',');
|
|
|
|
+
|
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
|
+ for (String s : accessoriesIds) {
|
|
|
|
+ sb.append(goodsMap.get(Integer.parseInt(s)).getName()).append(",");
|
|
|
|
+ }
|
|
|
|
+ dto.setAccessoriesName(StringUtils.removeEnd(sb.toString(), ","));
|
|
|
|
+ }
|
|
|
|
|
|
dto.setAccessoriesAmount(userOrderTypeMap.get(OrderDetailTypeEnum.ACCESSORIES));
|
|
dto.setAccessoriesAmount(userOrderTypeMap.get(OrderDetailTypeEnum.ACCESSORIES));
|
|
dto.setCourseAmount(userOrderTypeMap.get(OrderDetailTypeEnum.COURSE));
|
|
dto.setCourseAmount(userOrderTypeMap.get(OrderDetailTypeEnum.COURSE));
|