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();