wangyingyang

fix

...@@ -275,13 +275,18 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord ...@@ -275,13 +275,18 @@ public class OrderDetailDbServiceImpl extends ServiceImpl<OrderDetailMapper, Ord
275 .map(OrderDetailDb::getServeStatus) 275 .map(OrderDetailDb::getServeStatus)
276 .distinct() 276 .distinct()
277 .collect(Collectors.toList()); 277 .collect(Collectors.toList());
278 + final var isCanceled = curOrderDetailStatus.stream().allMatch(s -> s.equals(ServeStatusEnum.SERVE_REJECT_VALUE));
278 final var serveNotStartStatus = curOrderDetailStatus.stream() 279 final var serveNotStartStatus = curOrderDetailStatus.stream()
279 .filter(s -> s.equals(ServeStatusEnum.SERVE_NOT_START_VALUE)) 280 .filter(s -> s.equals(ServeStatusEnum.SERVE_NOT_START_VALUE))
280 .findAny(); 281 .findAny();
281 - if(serveNotStartStatus.isEmpty()) { 282 + if (isCanceled || serveNotStartStatus.isEmpty()) {
282 var orderDb = new OrderDb(); 283 var orderDb = new OrderDb();
283 orderDb.setId(orderId); 284 orderDb.setId(orderId);
284 - orderDb.setStatus(OrderStatusEnum.ALL_SERVED_VALUE); 285 + if (isCanceled) {
286 + orderDb.setStatus(OrderStatusEnum.ORDER_CANCELED_VALUE);
287 + } else {
288 + orderDb.setStatus(OrderStatusEnum.ALL_SERVED_VALUE);
289 + }
285 orderDbMapper.updateById(orderDb); 290 orderDbMapper.updateById(orderDb);
286 } 291 }
287 } 292 }
......