diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index 47402a5..c6ac8ce 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -166,6 +166,7 @@ class CallBackController extends AbstractController $cloud_custom_data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; $cloud_custom_data['is_system'] = 1; $cloud_custom_data['inquiry_type'] = $order_inquiry['inquiry_type']; + $cloud_custom_data['message_rounds'] = 0; // 消息内容 $message_content_data = array(); diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index ed7c793..7a38517 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -6,6 +6,8 @@ use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer; use App\Constants\HttpEnumCode; use App\Model\DoctorInquiryTime; use App\Model\DoctorPharmacistCert; +use App\Model\UserDoctor; +use App\Services\ImService; use App\Utils\Log; use Extend\Alibaba\Oss; use Extend\Ca\Ca; @@ -433,17 +435,32 @@ class TestController extends AbstractController } public function test_10(){ - $a = [ - [ - "start_time"=>"0110", - "end_time"=>"2400", - ] + $ImService = new ImService(); + + // 获取订单医生数据 + $params = array(); + $params['doctor_id'] = "494429911331946496"; + $user_doctor = UserDoctor::getOne($params); + + + // 自定义消息 + $cloud_custom_data = array(); + $cloud_custom_data['order_inquiry_id'] = "498932680833085441"; + $cloud_custom_data['is_system'] = 1; + $cloud_custom_data['inquiry_type'] = 1; + $cloud_custom_data['message_rounds'] = 0; + + // 消息内容 + $message_content_data = array(); + $message_content_data['message_type'] = 1; + $message_content_data['content'] = "--等待医生接诊--"; + $message_content_data['desc'] = "温馨提示:您可继续补充问诊内容,便于更快确认病情,医生均在临床一线工作,还请耐心等待,医生接诊会第一时间短信通知您。"; + $message_content = [ + 'Data' => json_encode($message_content_data,JSON_UNESCAPED_UNICODE), ]; - foreach ($a as $item){ - dump(); + $ImService->sendMessage("494429911046733824", "498932257254518784", $message_content, "TIMCustomElem", $cloud_custom_data); - } } diff --git a/app/Request/UserDoctorRequest.php b/app/Request/UserDoctorRequest.php index 754e693..c7f0ffc 100644 --- a/app/Request/UserDoctorRequest.php +++ b/app/Request/UserDoctorRequest.php @@ -60,13 +60,13 @@ class UserDoctorRequest extends FormRequest 'putPrescription' => [ // 修改处方 'order_prescription_id', 'prescription_icd',// 诊断疾病 - 'doctor_advice', // 医嘱 +// 'doctor_advice', // 医嘱 'prescription_product',// 处方药品 ], 'addPrescription' => [ // 新增处方 'order_inquiry_id',// 订单-问诊id 'prescription_icd',// 诊断疾病[] - 'doctor_advice', // 医嘱 +// 'doctor_advice', // 医嘱 'prescription_product',// 处方药品[] ], 'getDoctorMessageList' => [ // 获取医生问诊消息列表 diff --git a/app/Services/LoginService.php b/app/Services/LoginService.php index 4ca4553..6788770 100644 --- a/app/Services/LoginService.php +++ b/app/Services/LoginService.php @@ -334,6 +334,11 @@ class LoginService extends BaseService Db::rollBack(); return fail(HttpEnumCode::SERVER_ERROR); } + + // 创建im账号 + $account = new Account(); + // 创建单个账号 + $account->createAccount($user->user_id,$user->user_name,""); } else { // 已注册用户 if ($user_type != $user['user_type']) { diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 1a571a0..d2c9034 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Amqp\Producer\AssignPharmacistProducer; use App\Amqp\Producer\PrescriptionDistributePhProducer; use App\Constants\DoctorTitleCode; use App\Constants\HttpEnumCode; @@ -1114,7 +1115,7 @@ class UserDoctorService extends BaseService $data = array(); $data['order_prescription_id'] = $order_prescription_id; - $message = new PrescriptionDistributePhProducer($data); + $message = new AssignPharmacistProducer($data); $producer = ApplicationContext::getContainer()->get(Producer::class); $result = $producer->produce($message); if (!$result) { @@ -1280,7 +1281,7 @@ class UserDoctorService extends BaseService $data = array(); $data['order_prescription_id'] = $order_prescription['order_prescription_id']; - $message = new PrescriptionDistributePhProducer($data); + $message = new AssignPharmacistProducer($data); $producer = ApplicationContext::getContainer()->get(Producer::class); $result = $producer->produce($message); if (!$result) {