修改推送数据，进入账户金额计算问题

app/Amqp/Consumer/AutoCompleteServicePackageDelayDirectConsumer.php

@@ -121,17 +121,16 @@ class AutoCompleteServicePackageDelayDirectConsumer extends ConsumerMessage
             $params['order_service_id'] = $order_service_package['order_service_id'];
             OrderServicePackage::edit($params,$data);
 
-            // 处理统计问题
-            if ($order_service_package['amount_total'] > 0) {
             // 计算本次问诊服务包问诊金额
+            if ($order_service_package['order_service_type'] == 1){
                 $amount_total = bcmul(
-                    (string)$order_service_package_detail['service_count'],
-                    bcmul(
                     (string)$order_service_package_detail['single_inquiry_price'],
-                        "0.75",
-                        3),
-                    3
+                    (string)$order_service_package_detail['service_count'],
+                    8
                 );
+            }else{
+                $amount_total = $order_service_package_detail['service_price'];
+            }
 
             // 处理医生账户总表
             $res = $this->handleDoctorAccount($amount_total,$order_service_package['doctor_id']);
@@ -146,7 +145,6 @@ class AutoCompleteServicePackageDelayDirectConsumer extends ConsumerMessage
                 Db::rollBack();
                 return Result::REQUEUE;
             }
-            }
 
             Db::commit();
         }catch (\Throwable $e){

app/Services/MessagePush.php

@@ -3126,7 +3126,7 @@ class MessagePush extends BaseService
             $sub_data['params']['page'] = "Pages/yishi/wenzhen_v2/wenzhen";
             $sub_data['params']['data'] = [
                 "thing1" => "{$order_service_type}服务已完成",// 提醒内容
-                "name2" => $this->order_inquiry['patient_name'],// 患者姓名
+                "name2" => $order_service_package['patient_name'],// 患者姓名
                 "thing4" => $disease_desc,// 病情描述
                 "thing6" => "您可以提醒患者进行续费",// 提示说明
                 "thing5" => "",// 咨询内容

app/Services/OrderServicePackageService.php

@@ -1478,6 +1478,7 @@ class OrderServicePackageService extends BaseService
                         bcmul(
                             (string)$order_service_package_detail['single_inquiry_price'],
                             (string)$order_service_package_detail['service_count'],
+                            2
                         ),
                         2
                     );