From ec0bec53254ddc4dbd80e1738a170eeec0b95b8d Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 7 May 2024 19:07:18 +0800
Subject: [PATCH] 1

---
 app/Services/OrderServicePackageService.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php
index 25b359d..95ee677 100644
--- a/app/Services/OrderServicePackageService.php
+++ b/app/Services/OrderServicePackageService.php
@@ -378,7 +378,7 @@ class OrderServicePackageService extends BaseService
             $monthly_frequency = $health_package['monthly_frequency'];
 
             // 单次图文问诊价格
-            $single_inquiry_price = $doctor_inquiry_config['inquiry_price'];
+            $single_inquiry_price = $doctor_inquiry_config['inquiry_price'] * $health_package['service_rate'];
         }
 
         // 随访包
@@ -413,9 +413,6 @@ class OrderServicePackageService extends BaseService
 
             // 每月次数（0表示不限次）
             $monthly_frequency = $doctor_config_follow_package['monthly_frequency'];
-
-            // 单次图文问诊价格
-            $single_inquiry_price = $doctor_inquiry_config['inquiry_price'];
         }
 
         // 判断数据
@@ -423,7 +420,7 @@ class OrderServicePackageService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR, "订单创建失败");
         }
 
-        if ($service_period === null || $single_inquiry_price === null){
+        if ($service_period === null){
             return fail(HttpEnumCode::HTTP_ERROR, "订单创建失败");
         }
 
@@ -1476,9 +1473,9 @@ class OrderServicePackageService extends BaseService
             if (!empty($order_service_package_detail)){
                 // 计算本次问诊服务包问诊金额
                 $amount_total = bcmul(
-                    (string)$order_service_package_detail['service_count'],
-                    (string)$order_service_package_detail['single_inquiry_price'],
-                    3
+                    (string)$order_service_package_detail['service_price'],
+                    0.75,
+                    2
                 );
             }
         }