wangyingyang

fix

......@@ -275,13 +275,18 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
.map(OrderDetailDb::getServeStatus)
.distinct()
.collect(Collectors.toList());
final var isCanceled = curOrderDetailStatus.stream().allMatch(s -> s.equals(ServeStatusEnum.SERVE_REJECT_VALUE));
final var serveNotStartStatus = curOrderDetailStatus.stream()
.filter(s -> s.equals(ServeStatusEnum.SERVE_NOT_START_VALUE))
.findAny();
if(serveNotStartStatus.isEmpty()) {
if (isCanceled || serveNotStartStatus.isEmpty()) {
var orderDb = new OrderDb();
orderDb.setId(orderId);
if (isCanceled) {
orderDb.setStatus(OrderStatusEnum.ORDER_CANCELED_VALUE);
} else {
orderDb.setStatus(OrderStatusEnum.ALL_SERVED_VALUE);
}
orderDbMapper.updateById(orderDb);
}
}
......