1

app/Services/InquiryService.php

@@ -296,18 +296,6 @@ class InquiryService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage());
         }
 
-        try {
-            if (!empty($request_params['doctor_id']) && ($request_params['inquiry_type'] == 1 || $request_params['inquiry_type'] == 3)){
-                if (isset($doctor)){
-                    // 发送站内、订阅失败发送短信消息-医生有新问诊
-                    $MessagePush = new MessagePush($doctor['user_id'],$order_inquiry['order_inquiry_id']);
-                    $MessagePush->doctorHaveNewInquiry();
-                }
-            }
-        } catch (\Exception $e) {
-            Log::getInstance()->error("新问诊消息发送失败：" . $e->getMessage());
-        }
-
         $result = array();
         $result['inquiry_no'] = (string)$order_inquiry['inquiry_no']; // 订单编号
         $result['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id']; // 订单主键id
@@ -867,23 +855,23 @@ class InquiryService extends BaseService
             throw new BusinessException("订单数据为空");
         }
 
-        // 检测问诊订单状态
-        if (!in_array($order_inquiry['inquiry_status'], [2, 3, 4, 5, 7])) {
-            // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
-            throw new BusinessException("订单状态错误");
-        }
-
-        // 检测订单退款状态
-        if (in_array($order_inquiry['inquiry_refund_status'], [2, 3, 5])) {
-            // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
-            throw new BusinessException("订单退款状态错误");
-        }
-
-        // 检测支付状态
-        if ($order_inquiry['inquiry_pay_status'] != 2) {
-            // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
-            throw new BusinessException("订单支付状态错误");
-        }
+//        // 检测问诊订单状态
+//        if (!in_array($order_inquiry['inquiry_status'], [2, 3, 4, 5, 7])) {
+//            // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+//            throw new BusinessException("订单状态错误");
+//        }
+//
+//        // 检测订单退款状态
+//        if (in_array($order_inquiry['inquiry_refund_status'], [2, 3, 5])) {
+//            // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
+//            throw new BusinessException("订单退款状态错误");
+//        }
+//
+//        // 检测支付状态
+//        if ($order_inquiry['inquiry_pay_status'] != 2) {
+//            // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+//            throw new BusinessException("订单支付状态错误");
+//        }
 
         // 系统退款编号
         $generator = $this->container->get(IdGeneratorInterface::class);

app/Services/UserDoctorService.php

@@ -557,14 +557,14 @@ class UserDoctorService extends BaseService
         $DoctorAccountService = new DoctorAccountService();
         $balance_account = $DoctorAccountService->getDoctorBalanceAccount($user_info['client_user_id']);
         if ($balance_account > 0) {
-            $balance_account = round($balance_account * 0.75,2);
+            $balance_account = round($balance_account,2);
         }
 
         // 获取医生当日接诊的订单金额
         $InquiryService = new InquiryService();
         $estimate_income = $InquiryService->getDoctorDayAmountTotal($user_info['client_user_id'], date('Y-m-d', time()));
         if (!empty($estimate_income)) {
-            $estimate_income = round($estimate_income * 0.75,2);
+            $estimate_income = round($estimate_income,2);
         }
 
         $user_doctor['avatar'] = addAliyunOssWebsite($user_doctor['avatar']);