修改 获取服务包订单中医生可分成的问诊金额

app/Services/DoctorAccountService.php

@@ -200,9 +200,9 @@ class DoctorAccountService extends BaseService
                     } elseif ($result['OrderServicePackage']['order_service_status'] == 4) {
                         $result['entry_status'] = 2;// 入账成功
                     } elseif ($result['OrderServicePackage']['order_service_status'] == 5) {
-                        if ($result['expected_amount_total'] > 0) {
+                        if (($result['payment_amount_total'] - $result['refund_total']) > 0){
                             $result['entry_status'] = 2;// 入账成功
-                        } else {
+                        }else{
                             $result['entry_status'] = 3;// 入账失败
                         }
                     } else {

app/Services/OrderServicePackageService.php

@@ -1671,6 +1671,12 @@ class OrderServicePackageService extends BaseService
         $OrderService = new OrderService();
         $refund_total = $OrderService->getOrderRefundAmount($order_service_no);
 
+        // 检测订单是否全部退款
+        if (($order_service_package['payment_amount_total'] - $refund_total) <= 0){
+            // 订单已全部退款，此处可分成问诊金额直接为0
+            return 0;
+        }
+
         if ($order_service_package['order_service_type'] == 1){
             // 健康包
             // 实际问诊数量