From 6343cc23d3e39ead11af973974d0f8b119be00ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com>
Date: Wed, 3 Apr 2024 17:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=9B=9E=E6=94=B6=E3=80=81?=
 =?UTF-8?q?=E5=AE=9A=E7=82=B9=E5=9B=9E=E6=94=B6=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=90=8Ebug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/yunxi/service/impl/RecycleOrderServiceImpl.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
index 4d8343f..10dcb06 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java
@@ -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("订单已完成结算!");
         }