From 992dac2c1b8770654c3e404ffecde05678401228 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 12 Dec 2023 13:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/BasicDataService.php   |  4 ++--
 app/Services/UserDoctorService.php  | 11 +++++++++++
 app/Services/UserPatientService.php |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Services/BasicDataService.php b/app/Services/BasicDataService.php
index 53fc67b..04d6b0f 100644
--- a/app/Services/BasicDataService.php
+++ b/app/Services/BasicDataService.php
@@ -447,8 +447,8 @@ class BasicDataService extends BaseService
         ];
 
         $params = array();
-
-
+        $params['product_status'] = 1;
+        $params['is_delete'] = 0;
         $product = Product::getWithAmountPage($params, $keyword,$fields, $page, $per_page);
         if (empty($product['data'])) {
             return success($product);
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index 0fe3404..d2934d7 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -1433,6 +1433,16 @@ class UserDoctorService extends BaseService
                     return fail(HttpEnumCode::SERVER_ERROR,"商品错误");
                 }
 
+                if ($product['product_status'] == 2){
+                    Db::rollBack();
+                    return fail(HttpEnumCode::HTTP_ERROR,"药品" . $product['product_name'] . "已下架");
+                }
+
+                if ($product['is_delete'] == 1){
+                    Db::rollBack();
+                    return fail(HttpEnumCode::HTTP_ERROR,"药品" . $product['product_name'] . "已被删除，无法开具");
+                }
+
                 // 获取商品库存
                 $params =array();
                 $params['product_platform_id'] = $product['product_platform_id'];
@@ -1444,6 +1454,7 @@ class UserDoctorService extends BaseService
                 }
 
                 if ($product_platform_amount['stock'] <= 0){
+                    Db::rollBack();
                     return fail(HttpEnumCode::HTTP_ERROR,"商品库存不足");
                 }
 
diff --git a/app/Services/UserPatientService.php b/app/Services/UserPatientService.php
index 69b6e95..c0d9c5c 100644
--- a/app/Services/UserPatientService.php
+++ b/app/Services/UserPatientService.php
@@ -278,6 +278,7 @@ class UserPatientService extends BaseService
             if (empty($product)){
                 return fail();
             }
+
             // 获取商品库存
             $params =array();
             $params['product_platform_id'] = $product['product_platform_id'];