Merge branch 'dev'
This commit is contained in:
@@ -160,10 +160,14 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
|
||||
// 发送IM消息-问诊退款
|
||||
$imService->inquiryRefund($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']);
|
||||
|
||||
// 发送站内、订阅消息-医生未接诊
|
||||
// 发送站内、订阅消息-患者-医生未接诊
|
||||
$MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
|
||||
$MessagePush->patientNoInquiry();
|
||||
|
||||
// 发送站内、订阅消息-医生-超时未接诊
|
||||
$MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']);
|
||||
$MessagePush->doctorNoInquiry();
|
||||
|
||||
if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0) {
|
||||
// 获取用户优惠卷信息
|
||||
$params = array();
|
||||
|
||||
@@ -552,7 +552,7 @@ class ImService extends BaseService
|
||||
* @param string $patient_user_id
|
||||
* @return void
|
||||
*/
|
||||
public function pharmacistVerify(array|object $order_inquiry, string $order_prescription_id,string $product_name,string $doctor_user_id, string $patient_user_id): void
|
||||
public function pharmacistVerify(array|object $order_inquiry, string $order_prescription_id, string $product_name, string $doctor_user_id, string $patient_user_id): void
|
||||
{
|
||||
try {
|
||||
// 发送消息
|
||||
@@ -573,7 +573,7 @@ class ImService extends BaseService
|
||||
$message_content_data['data']['order_inquiry_id'] = (string)$order_inquiry['order_inquiry_id'];
|
||||
$message_content_data['data']['order_prescription_id'] = $order_prescription_id;
|
||||
$message_content_data['data']['product_name'] = $product_name ?: "药品";
|
||||
$message_content_data['data']['pharmacist_verify_time'] = date('Y-m-d H:i:s',time());;
|
||||
$message_content_data['data']['pharmacist_verify_time'] = date('Y-m-d H:i:s', time());;
|
||||
|
||||
$message_content = [
|
||||
'Data' => json_encode($message_content_data, JSON_UNESCAPED_UNICODE),
|
||||
@@ -619,4 +619,47 @@ class ImService extends BaseService
|
||||
throw new BusinessException($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 横幅通知-医生有新问诊
|
||||
* @param array|object $order_inquiry
|
||||
* @param string $doctor_user_id 用户id
|
||||
* @return void
|
||||
*/
|
||||
public function bannerNoticeNewInquiry(array|object $order_inquiry, string $doctor_user_id): void
|
||||
{
|
||||
try {
|
||||
// 发送消息
|
||||
$cloud_custom_data = array();
|
||||
$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;
|
||||
$cloud_custom_data['patient_family_data']['patient_name'] = $order_inquiry['patient_name'];
|
||||
$cloud_custom_data['patient_family_data']['patient_sex'] = $order_inquiry['patient_sex'];
|
||||
$cloud_custom_data['patient_family_data']['patient_age'] = $order_inquiry['patient_age'];
|
||||
|
||||
if ($order_inquiry['inquiry_type'] == 1 || $order_inquiry['inquiry_type'] == 3) {
|
||||
// 专家、公益
|
||||
$desc = "24小时内未接诊，平台将自动取消问诊";
|
||||
}else{
|
||||
// 快速、购药
|
||||
$desc = "5分钟内未接诊，平台将自动取消问诊";
|
||||
}
|
||||
|
||||
// 消息内容
|
||||
$message_content_data = array();
|
||||
$message_content_data['message_type'] = 8;
|
||||
$message_content_data['title'] = "您有一个新的问诊服务等待接诊";
|
||||
$message_content_data['desc'] = $desc;
|
||||
$message_content_data['data']['message_path'] = "/Pages/yishi/wenzhen_v2/wenzhen";
|
||||
$message_content = [
|
||||
'Data' => json_encode($message_content_data, JSON_UNESCAPED_UNICODE),
|
||||
];
|
||||
|
||||
$this->sendMessage("", $doctor_user_id, $message_content, "TIMCustomElem", $cloud_custom_data);
|
||||
} catch (\Exception $e) {
|
||||
throw new BusinessException($e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
+254
-173
File diff suppressed because it is too large
Load Diff
@@ -483,7 +483,7 @@ class PatientDoctorService extends BaseService
|
||||
// 无合适医生
|
||||
$result['status'] = 3;
|
||||
$result['data'] = "";
|
||||
$result['message'] = "目前暂无可接诊医生";
|
||||
$result['message'] = "暂无可接诊医生，请选择其他服务入口进行问诊";
|
||||
return success($result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,16 +281,19 @@ class UserDoctorService extends BaseService
|
||||
// 处理银行卡掩码
|
||||
$bank_card_code_mask = Mask::maskBankCard($bank_card_code);
|
||||
|
||||
// 验证银行卡
|
||||
$BankCard = new BankCard();
|
||||
$app_env = config('app_env','dev');
|
||||
if ($app_env != "dev"){
|
||||
// 验证银行卡
|
||||
$BankCard = new BankCard();
|
||||
|
||||
$params = array();
|
||||
$params['bankCardNo'] = $bank_card_code;
|
||||
$params['name'] = $user_doctor_info['card_name'];
|
||||
$params['idCardNo'] = $user_doctor_info['card_num'];
|
||||
$res = $BankCard->checkBankCard($params);
|
||||
if (!empty($res)){
|
||||
return fail(HttpEnumCode::HTTP_ERROR,$res);
|
||||
$params = array();
|
||||
$params['bankCardNo'] = $bank_card_code;
|
||||
$params['name'] = $user_doctor_info['card_name'];
|
||||
$params['idCardNo'] = $user_doctor_info['card_num'];
|
||||
$res = $BankCard->checkBankCard($params);
|
||||
if (!empty($res)){
|
||||
return fail(HttpEnumCode::HTTP_ERROR,$res);
|
||||
}
|
||||
}
|
||||
|
||||
Db::beginTransaction();
|
||||
|
||||
+13
-16
@@ -146,22 +146,19 @@ class Data
|
||||
// 处方平台商品入库
|
||||
public function product(){
|
||||
$product_platform_id = [
|
||||
"517653593319849984",
|
||||
"517653593307267072",
|
||||
"517653183070781440",
|
||||
"517653183108530177",
|
||||
"517653780314505216",
|
||||
"517653906961514496",
|
||||
"517654391143579648",
|
||||
"517653404613918721",
|
||||
"517653593365987328",
|
||||
"517652642206892032",
|
||||
"517654018844573697",
|
||||
"517654039933534208",
|
||||
"517653593282101250",
|
||||
"517653183154667520",
|
||||
"517653183074975745",
|
||||
"517654039895785472",
|
||||
"518095343843098625",
|
||||
"519091456971071489",
|
||||
"517652954976141313",
|
||||
"519151179795808256",
|
||||
"517652642211086336",
|
||||
"517653593286295552",
|
||||
"517653183070781441",
|
||||
"517653906999263232",
|
||||
"517652642227863552",
|
||||
"517653183100141569",
|
||||
"517653906969903104",
|
||||
"522376951584849921",
|
||||
"522378613456175104",
|
||||
];
|
||||
|
||||
foreach ($product_platform_id as $value){
|
||||
|
||||
Reference in New Issue
Block a user