修改订单可提现金额

app/Model/Order.php

@@ -289,7 +289,6 @@ class Order extends Model
                         ->whereRaw('gdxz_order.order_id = gdxz_order_service_package.order_id')
                         ->whereIn('refund_status', [0,3])
                         ->where('pay_status', 2)
-                        ->where('start_time', 2)
                         ->whereIn('order_service_status', [4,5])
                         ->WhereExists(function ($subQuery){
                             $subQuery->from("order_service_package_inquiry")
@@ -341,7 +340,6 @@ class Order extends Model
                         ->whereRaw('gdxz_order.order_id = gdxz_order_service_package.order_id')
                         ->whereIn('refund_status', [0,3])
                         ->where('pay_status', 2)
-                        ->where('start_time', 2)
                         ->whereIn('order_service_status', [4,5])
                         ->WhereExists(function ($subQuery){
                             $subQuery->from("order_service_package_inquiry")

app/Services/OrderService.php

@@ -1093,7 +1093,7 @@ class OrderService extends BaseService
         // 可提现金额
         $expected_amount_total = 0;
 
-        // 计算可提现金额
+        // 问诊订单
         if ($order['order_type'] == 1){
             $expected_amount_total = bcmul(
                 bcsub(
@@ -1106,25 +1106,22 @@ class OrderService extends BaseService
             );
         }
 
+        // 服务包订单
         if ($order['order_type'] == 4 || $order['order_type'] == 5){
-            // 获取订单详情数据
+            // 获取订单数据
             $params = array();
             $params['order_service_no'] = $order['order_no'];
-            $order_service_package_detail = OrderServicePackageDetail::getOne($params);
+            $order_service_package = OrderServicePackage::getOne($params);
-            if (!empty($order_service_package_detail)){
+            if (!empty($order_service_package)){
-                $expected_amount_total = bcmul( // 可提现费用
+                // 获取订单详情数据
-                    bcsub( // 退款费用
+                $params = array();
-                        bcmul( // 问诊费用
+                $params['order_service_no'] = $order['order_no'];
-                            (string)$order_service_package_detail['service_count'],
+                $order_service_package_detail = OrderServicePackageDetail::getOne($params);
-                            (string)$order_service_package_detail['single_inquiry_price'],
+                if (!empty($order_service_package_detail)){
-                            3
+                    // 获取服务包订单中医生可分成的问诊金额
-                        ),
+                    $OrderServicePackageService = new OrderServicePackageService();
-                        (string)$refund_total,
+                    $expected_amount_total = $OrderServicePackageService->getServicePackageDoctorInquiryAmountTotal($order_service_package['order_service_no'],$order_service_package,$order_service_package_detail);
-                        3
+                }
-                    ),
-                    "0.75",
-                    2
-                );
             }
         }
 

app/Services/OrderServicePackageService.php

@@ -1658,33 +1658,6 @@ class OrderServicePackageService extends BaseService
         return $order_service_package->toArray();
     }
 
-
-    /**
-     * 获取服务包退款金额
-     * @param string|int $order_service_no
-     * @return string|int
-     */
-    public function getServicePackageRefundTotal(string|int $order_service_no): string|int
-    {
-        // 获取退款数据
-        $refund_total = 0;
-
-        $params = array();
-        $params['order_service_no'] = $order_service_no;
-        $order_service_package_refunds = OrderServicePackageRefund::getList($params);
-        if (!empty($order_service_package_refunds)) {
-            foreach ($order_service_package_refunds as $order_service_package_refund) {
-                $refund_total = bcadd(
-                    (string)$refund_total,
-                    (string)$order_service_package_refund['refund_total'],
-                    2
-                );
-            }
-        }
-
-        return $refund_total;
-    }
-
     /**
      * 获取服务包订单中医生可分成的问诊金额
      * @param string|int $order_service_no
@@ -1695,7 +1668,8 @@ class OrderServicePackageService extends BaseService
     public function getServicePackageDoctorInquiryAmountTotal(string|int $order_service_no,array|object $order_service_package,array|object $order_service_package_detail): string
     {
         // 获取服务包退款金额
-        $refund_total = $this->getServicePackageRefundTotal($order_service_no);
+        $OrderService = new OrderService();
+        $refund_total = $OrderService->getOrderRefundAmount($order_service_no);
 
         if ($order_service_package['order_service_type'] == 1){
             // 健康包
@@ -1743,6 +1717,4 @@ class OrderServicePackageService extends BaseService
         return $amount_total;
     }
 
-
-
 }