From 43876a9d578072aebf2455c52d21f96f406472dc Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Sun, 28 Apr 2024 16:02:40 +0800
Subject: [PATCH] 1

---
 app/Services/OrderServicePackageService.php | 26 +++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index 208a792..744cb7e 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -624,11 +624,19 @@ class OrderServicePackageService extends BaseService
 
             // 检测服务包订单订单状态
             if ($order_service_package['order_service_status'] == 1) {
-                return fail(HttpEnumCode::HTTP_ERROR);
+                return fail(HttpEnumCode::HTTP_ERROR,"服务包订单未支付，不可使用");
             }
 
             if ($order_service_package['order_service_status'] == 2) {
-                return fail(HttpEnumCode::HTTP_ERROR);
+                return fail(HttpEnumCode::HTTP_ERROR,"服务包订单未生效，不可使用");
+            }
+
+            if ($order_service_package['order_service_status'] == 5) {
+                return fail(HttpEnumCode::HTTP_ERROR,"服务包订单已取消，不可使用");
+            }
+
+            if ($order_service_package['order_service_status'] == 4) {
+                return fail(HttpEnumCode::HTTP_ERROR,"服务包订单已完成，不可使用");
             }
 
             // 获取服务包订单详情
@@ -1026,6 +1034,20 @@ class OrderServicePackageService extends BaseService
                 return success($result);
             }
 
+            if ($order_service_package['order_service_status'] == 4) {
+                $result['status'] = 2;
+                $result['message'] = "服务已完成，请重新购买服务包";
+                $result['data']['order_no'] = $order_service_package['order_service_no'];
+                return success($result);
+            }
+
+            if ($order_service_package['order_service_status'] == 5) {
+                $result['status'] = 2;
+                $result['message'] = "服务已取消，请重新购买服务包";
+                $result['data']['order_no'] = $order_service_package['order_service_no'];
+                return success($result);
+            }
+
             // 获取服务包订单详情
             $params = array();
             $params['order_service_no'] = $order_service_package['order_service_no'];