提交 a432d2d2 authored 作者: liruixin's avatar liruixin

Merge branch 'v6.4_transportation_20231110' into test

......@@ -1241,7 +1241,7 @@ public class OrderChildServiceImpl implements OrderChildService {
List<OrderChildImage> images = orderChildImageDao.getImages(orderChildNo, OrderChildImage.Type.DRIVER_CANCEL.getCode());
OrderChild orderChild = orderChildDao.getByChildNo(orderChildNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
result.setCancelDetail(orderChild.getCancelDetail());
result.setCancelRemark(OrderChildEnum.Status.getMsgByCode(orderChild.getStatus())+","+orderChild.getCancelRemark());
result.setCancelRemark(orderChild.getCancelRemark());
if (CollectionUtils.isNotEmpty(images)) {
result.setImageList(images.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论