|
|
|
@ -168,6 +168,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
if (!recycleOrder.getClientId().equals(orderCancelVO.getClientId())) {
|
|
|
|
|
throw new BizIllegalException("非法操作!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.FINISHED)) {
|
|
|
|
|
throw new BizIllegalException("订单已完成!");
|
|
|
|
|
}
|
|
|
|
|
recycleOrder = BeanUtils.copyBean(orderCancelVO, RecycleOrder.class);;
|
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.CANCELED);
|
|
|
|
|
recycleOrder.setUpdateTime(LocalDateTime.now());
|
|
|
|
@ -206,6 +209,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
if (!recycleOrder.getStaffsId().equals(orderFinishVO.getStaffsId())) {
|
|
|
|
|
throw new BizIllegalException("非法操作!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.FINISHED)) {
|
|
|
|
|
throw new BizIllegalException("订单已完成结算!");
|
|
|
|
|
}
|
|
|
|
|
String clientId = recycleOrder.getClientId();
|
|
|
|
|
recycleOrder = BeanUtils.copyBean(orderFinishVO, RecycleOrder.class);;
|
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.FINISHED);
|
|
|
|
|