From c8edff4c1c893bc9ed5ad1cdc7d1f331fb03774c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 17 Jul 2024 10:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=BE=85=E8=A1=A5=E5=8D=95=E8=B5=B0?=
 =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/service/impl/OrdersServiceImpl.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index 4a3fa4a..6371ee6 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -2017,6 +2017,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
             if(orders.getParentId() != null && orders.getParentId() != 0){
                 return Result.error("项目加钟之后，无法取消！");
             }
+        }else if(orders.getStatus() == 10) {
+            return cancelSupplementOrders(userId,ordersId,0,2);
+        }else if(orders.getStatus() == 9) {
+            if(orders.getRefusalContent()!=null && !orders.getRefusalContent().equals("")){
+                return cancelSupplementOrders(userId,ordersId,0,3);
+            }
         }
         //按时间扣款，获取扣款金额
         CommonInfo commonInfo = commonInfoService.isCheckChangeOrder(DateUtils.stringToDate(orders.getServeTime(),"yyyy-MM-dd HH:mm") ,new Date());