Skip to content

J
jiedao-api-boot-master
Commit c1ec2431 authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

web-app端订单详情中的屏蔽清关动态

parent 910207c2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/app/order/MyOrderController.java
View file @ c1ec2431
...@@ -336,8 +336,9 @@ public class MyOrderController { ...@@ -336,8 +336,9 @@ public class MyOrderController {
OrderBackInfoDto dto = orderQueryService.info(orderId); OrderBackInfoDto dto = orderQueryService.info(orderId);
dto.setUserType(UserTypeEnum.MEMBER.getValue()); dto.setUserType(UserTypeEnum.MEMBER.getValue());
if (CollectionUtil.isNotEmpty(dto.getOrderTimeVOList())) { if (CollectionUtil.isNotEmpty(dto.getOrderTimeVOList())) {
List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new)); List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream()
dto.setOrderTimeVOList(orderTimeVOList.stream().sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList())); .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
dto.setOrderTimeVOList(orderTimeVOList.stream().filter(t -> t.getStatus() != 15 && t.getStatus() != 150330).sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
} }
return success(dto); return success(dto);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment