From 20948496f6105fca1e2bd22ed49ae7df7386e9f4 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Sun, 28 Apr 2024 10:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96im=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=B8=AD=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php       |  1 -
 app/Services/OrderServicePackageService.php | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index cb12a3b..e34b827 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -2774,7 +2774,6 @@ class CallBackController extends AbstractController
                 $time = 60 * 10;
             }
 
-            Log::getInstance("CallBack-wxPayServiceSuccess")->info($time);
             $data = array();
             $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
             $data['order_no'] = $order_inquiry['inquiry_no'];
diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index ec94b43..1f32903 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -1535,10 +1535,12 @@ class OrderServicePackageService extends BaseService
         $remaining_quantity = 0;
 
         // 获取服务包内所有药品
-        $health_package_products = $OrderServicePackageService->getOrderServiceProduct($order_service_package_detail['package_id']);
-        foreach ($health_package_products as $health_package_product) {
-            // 获取服务包内某一药品的剩余数量
-            $remaining_quantity = $OrderServicePackageService->getOrderServiceProductCanUseQuantity($order_service_package['order_service_id'],$health_package_product['product_id'],$health_package_product['quantity']);
+        if ($order_service_package['order_service_type'] == 1){
+            $health_package_products = $OrderServicePackageService->getOrderServiceProduct($order_service_package_detail['package_id']);
+            foreach ($health_package_products as $health_package_product) {
+                // 获取服务包内某一药品的剩余数量
+                $remaining_quantity = $OrderServicePackageService->getOrderServiceProductCanUseQuantity($order_service_package['order_service_id'],$health_package_product['product_id'],$health_package_product['quantity']);
+            }
         }
 
         $result = array();