Merge branch 'master-fix' into dev

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/app/order/MyOrderController.java

@@ -336,8 +336,9 @@ public class MyOrderController {
         OrderBackInfoDto dto = orderQueryService.info(orderId);
         dto.setUserType(UserTypeEnum.MEMBER.getValue());
         if (CollectionUtil.isNotEmpty(dto.getOrderTimeVOList())) {
-            List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(OrderTimeBackVO::getStatusType))), ArrayList::new));
-            dto.setOrderTimeVOList(orderTimeVOList.stream().sorted(Comparator.comparing(OrderTimeBackVO::getId).reversed()).collect(Collectors.toList()));
+            List<OrderTimeBackVO> orderTimeVOList = dto.getOrderTimeVOList().stream()
+                    .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);
     }