|
|
|
@ -367,6 +367,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
if (!recycleOrder.getStaffsId().equals(orderReachVO.getStaffsId())) {
|
|
|
|
|
throw new BusinessLogicException("非法操作!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.CANCELED)) {
|
|
|
|
|
throw new BusinessLogicException("订单已取消!");
|
|
|
|
|
}
|
|
|
|
|
// 判断是否到达
|
|
|
|
|
LocationDTO location = orderReachVO.getLocation();
|
|
|
|
|
BigDecimal distance = CommonUtil.getDistance(recycleOrder.getLongitude(), recycleOrder.getLatitude(),
|
|
|
|
@ -391,6 +394,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
if (StrUtil.isEmpty(recyclerId) || !recyclerId.equals(orderFinishVO.getStaffsId())) {
|
|
|
|
|
throw new BusinessLogicException("非法操作!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.CANCELED)) {
|
|
|
|
|
throw new BusinessLogicException("订单已取消!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.FINISHED)) {
|
|
|
|
|
throw new BusinessLogicException("订单已完成结算!");
|
|
|
|
|
}
|
|
|
|
@ -446,6 +452,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
public void finishOrderByHousing(TMRecycleOrderFinishVO tmOrderFinishVO) {
|
|
|
|
|
String orderId = tmOrderFinishVO.getId();
|
|
|
|
|
RecycleOrder recycleOrder = this.getOrderById(orderId, true);
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.CANCELED)) {
|
|
|
|
|
throw new BusinessLogicException("订单已取消!");
|
|
|
|
|
}
|
|
|
|
|
if (recycleOrder.getOrderStatus().equals(OrderStatusEnum.FINISHED)) {
|
|
|
|
|
throw new BusinessLogicException("订单已完成结算!");
|
|
|
|
|
}
|
|
|
|
|