diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php deleted file mode 100644 index 6e4cd5f..0000000 --- a/app/Amqp/Consumer/AssignDoctorConsumer.php +++ /dev/null @@ -1,303 +0,0 @@ -info("开始:" . json_encode($data, JSON_UNESCAPED_UNICODE)); - - Db::beginTransaction(); - - try { - // 获取订单数据 - $params = array(); - $params['order_inquiry_id'] = $data['order_inquiry_id']; - $order_inquiry = OrderInquiry::getOne($params); - if (empty($order_inquiry)) { - Db::rollBack(); - Log::getInstance()->error("错误:未查询到对应订单数据"); - return Result::DROP;// 销毁 - } - - $res = $this->checkInquiryStatus($order_inquiry); - if (!$res){ - Db::rollBack(); - Log::getInstance()->error("错误:订单状态错误"); - return Result::DROP;// 销毁 - } - - // 检测分配时间 - $pay_time = strtotime($order_inquiry['pay_time']); - $diff_time = time() - $pay_time; - if ($diff_time < 0) { - Db::rollBack(); - Log::getInstance()->error("分配医生队列执行失败:订单支付状态错误:时间计算错误"); - return Result::DROP;// 销毁 - } - - // 超出5分钟,执行退款 - if ($diff_time > 300) { - Log::getInstance()->error("分配医生队列执行失败:超出5分钟,执行退款"); - - $InquiryService = new InquiryService(); - - // 检测问诊订单执行退款次数 - Log::getInstance()->info("检测问诊订单执行退款次数"); - $res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']); - if (!$res){ - Db::rollBack(); - Log::getInstance()->error("分配医生队列执行失败原因:超出最大退款次数"); - return Result::ACK; - } - - $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "无可分配医生"); - - // 取消问诊订单 - $save_data = array(); - $save_data['inquiry_status'] = 7; - $save_data['cancel_time'] = date("Y-m-d H:i:s", time()); - $save_data['cancel_reason'] = 3; // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时) - $save_data['cancel_remarks'] = "未分配到合适的医生"; // 取消订单备注 - $save_data['updated_at'] = date("Y-m-d H:i:s", time()); - - $params = array(); - $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - OrderInquiry::edit($params, $save_data); - - Db::commit(); - return Result::ACK; - } - - // 检测当前是否符合系统问诊时间 - $inquiryService = new InquiryService(); - $is_system_time_pass = $inquiryService->checkSystemInquiryTime($order_inquiry['inquiry_type']); - if (!$is_system_time_pass && $order_inquiry['inquiry_type'] == 4){ - // 非坐班时间 - Log::getInstance()->error("分配医生队列执行失败:问诊购药非医生坐班时间,执行退款"); - - $InquiryService = new InquiryService(); - - // 检测问诊订单执行退款次数 - Log::getInstance()->info("检测问诊订单执行退款次数"); - $res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']); - if (!$res){ - Db::rollBack(); - Log::getInstance()->error("分配医生队列执行失败原因:超出最大退款次数"); - return Result::ACK; - } - - $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "无可分配医生"); - - // 取消问诊订单 - $save_data = array(); - $save_data['inquiry_status'] = 7; - $save_data['cancel_time'] = date("Y-m-d H:i:s", time()); - $save_data['cancel_reason'] = 3; // 取消订单原因(1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时) - $save_data['cancel_remarks'] = "无可分配医生"; // 取消订单备注 - $save_data['updated_at'] = date("Y-m-d H:i:s", time()); - - $params = array(); - $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - OrderInquiry::edit($params, $save_data); - - Db::commit(); - return Result::ACK; - } - - // 分配医生 - $UserDoctorService = new UserDoctorService(); - $doctor_id = $UserDoctorService->getInquiryAssignDoctor($order_inquiry['inquiry_type'],$order_inquiry['patient_id'],$is_system_time_pass); - if (empty($doctor_id)){ - // 无合适医生 - Db::rollBack(); - Log::getInstance()->info("分配医生队列执行:目前没有合适医生"); - $redis_value = $this->checkAssignCount($order_inquiry['order_inquiry_id']); - - Log::getInstance()->info("分配医生队列执行:目前没有合适医生,重试第" . $redis_value . "次"); - // 执行睡眠,防止重复执行队列 - // 执行规则,第一次30秒,第二次30秒。以30的倍数增加 - sleep($redis_value * 5); - - Log::getInstance()->info("分配医生队列执行:重回队列"); - return Result::REQUEUE; // 重回队列 - } - - // 更改数据库 - $save_data = array(); - $save_data['doctor_id'] = $doctor_id; - $save_data['inquiry_status'] = 3; // 待接诊 - - $params = array(); - $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - OrderInquiry::edit($params, $save_data); - - // 加入未接诊取消订单延迟队列 - $data = array(); - $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; - $message = new CancelUnInquiryOrdersDelayDirectProducer($data); - // 快速/购药-5分钟 - $message->setDelayMs(1000 * 60 * 2); - $producer = $this->container->get(Producer::class); - $res = $producer->produce($message); - if (!$res) { - Db::rollBack(); - Log::getInstance()->error("分配医生队列执行失败:加入未接诊取消订单延迟队列失败"); - return Result::ACK; - } - Log::getInstance()->info("分配医生队列执行:加入未接诊取消订单延迟队列成功"); - - Db::commit(); - Log::getInstance()->error("分配医生 队列执行成功"); - - } catch (\Exception $e) { - Db::rollBack(); - Log::getInstance()->error("分配医生队列执行失败原因:" . $e->getMessage()); - return Result::REQUEUE; // 重回队列 - } - - try { - // 分配医生成功,发送消息 - // 获取订单医生数据 - $params = array(); - $params['doctor_id'] = $doctor_id; - $user_doctor = UserDoctor::getOne($params); - if (empty($user_doctor)) { - Log::getInstance()->info("医生数据错误"); - return Result::ACK; - } - - // 发送IM消息-等待医生接诊 - $imService = new ImService(); - $imService->waitDoctorInquiry($order_inquiry,$user_doctor['user_id'],$order_inquiry['user_id']); - - // 医生-医生有新问诊 站内、订阅失败发送短信 - $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']); - $MessagePush->doctorHaveNewInquiry(); - - Log::getInstance()->info("分配医生成功,发送系统问诊消息成功"); - } catch (\Exception $e) { - // 验证失败 - Log::getInstance()->error("分配医生成功,发送系统问诊消息失败:" . $e->getMessage()); - return Result::ACK; - } - - return Result::ACK; - } - - /** - * 检测问诊订单分配次数 - * @param string $order_inquiry_id - * @return int - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface - */ - private function checkAssignCount(string $order_inquiry_id): int - { - Log::getInstance()->info("检测问诊订单分配次数"); - - $redis_value = 1; - try { - $redis = $this->container->get(Redis::class); - - $redis_key = "AssignDoctor" . $order_inquiry_id; - $redis_value = $redis->get($redis_key); - if(empty($redis_value)){ - $redis->set($redis_key, 1,60 * 60 * 24 * 5); - $redis_value = 1; - }else{ - $redis_value = $redis->incr($redis_key); - } - } catch (\Exception $e) { - Log::getInstance()->error("检测问诊订单分配次数失败:抛出异常" . $e->getMessage()); - } - - Log::getInstance()->info("检测问诊订单分配次数成功"); - - return $redis_value; - } - - - /** - * 检测订单状态 - * @param array|object $order_inquiry - * @return bool - */ - private function checkInquiryStatus(array|object $order_inquiry): bool - { - // 检测订单分配状态 - if (!empty($order_inquiry['doctor_id'])) { - Log::getInstance()->error("分配医生队列执行失败:已分配医生"); - return false; - } - - // 检测订单类型 - if ($order_inquiry['inquiry_type'] != 2 && $order_inquiry['inquiry_type'] != 4) { - Log::getInstance()->error("分配医生队列执行失败:订单非快速问诊、问诊购药类型"); - return false; - } - - // 检测订单退款状态 - if (in_array($order_inquiry['inquiry_refund_status'], [1, 2, 3])) { - // 问诊订单退款状态(0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭) - Log::getInstance()->error("分配医生队列执行失败:订单存在退款"); - return false; - } - - // 检测订单状态 - if ($order_inquiry['inquiry_status'] != 2) { - // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) - Log::getInstance()->error("分配医生队列执行失败:订单状态错误:当前为" . $order_inquiry['inquiry_status'] . " 无法进行分配"); - return false; - } - - // 检测订单支付状态 - if ($order_inquiry['inquiry_pay_status'] != 2) { - // 支付状态(1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款) - Log::getInstance()->error("分配医生队列执行失败:订单支付状态错误:当前为" . $order_inquiry['inquiry_pay_status'] . " 无法进行分配"); - return false; - } - - return true; - } -} diff --git a/app/Amqp/Producer/AssignDoctorProducer.php b/app/Amqp/Producer/AssignDoctorProducer.php deleted file mode 100644 index 5a30c1f..0000000 --- a/app/Amqp/Producer/AssignDoctorProducer.php +++ /dev/null @@ -1,27 +0,0 @@ -payload = $data; - } -} diff --git a/app/Services/CouponService.php b/app/Services/CouponService.php index df108a6..69e04d0 100644 --- a/app/Services/CouponService.php +++ b/app/Services/CouponService.php @@ -139,6 +139,7 @@ class CouponService extends BaseService $data['popup_title'] = "新人红包福利"; $popup_content = [ + 'user_coupon_id' => (string)$user_coupon->user_coupon_id, // 优惠卷金额 'coupon_price' => $value['coupon_price'], // 优惠卷金额 'application_scope' => $value['application_scope'], // 适用范围(1:全部 2:快速问诊 3:专家问诊 4:公益问诊 5:问诊购药) 'valid_type' => $value['valid_type'], // 有效类型(1:绝对时效,xxx-xxx时间段有效 2:相对时效 n天内有效) diff --git a/app/Services/UserService.php b/app/Services/UserService.php index dc27c70..f597bed 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -532,6 +532,7 @@ class UserService extends BaseService $params = array(); $params['user_id'] = $user_info['user_id']; $params['popup_type'] = $popup_type; + $params['status'] = 0; $popup = Popup::getList($params); if (empty($popup)){ return success(); diff --git a/config/autoload/amqp.php b/config/autoload/amqp.php index 307a990..aaf0f2c 100644 --- a/config/autoload/amqp.php +++ b/config/autoload/amqp.php @@ -11,7 +11,7 @@ declare(strict_types=1); */ return [ 'default' => [ - 'host' => env('AMQP_HOST', '42.193.16.243'), + 'host' => env('AMQP_HOST', '127.0.0.1'), 'port' => (int) env('AMQP_PORT', 5672), 'user' => env('AMQP_USER', 'gdxz_2022rabbitmq'), 'password' => env('AMQP_PASSWORD', 'qwr2p&¥e@3.2p'), diff --git a/config/config.php b/config/config.php index 34807b2..d8b47bd 100644 --- a/config/config.php +++ b/config/config.php @@ -67,7 +67,6 @@ return [ "bucket" => env("OSS_BUCKET","gdxz-hospital"), "endpoint" => env("OSS_ENDPOINT","oss-cn-chengdu.aliyuncs.com"), "custom_domain_name" => env("OSS_CUSTOM_DOMAIN_NAME","https://img.applets.igandanyiyuan.com"), - "oss_env" => env("OSS_ENV","applet-dev"), ], ], 'verify_dun' =>[ // 网易易盾 @@ -97,6 +96,7 @@ return [ "client_id" => env('PRE_PLAT_CLIENT_ID', 'ZD-004'), "client_secret" => env('PRE_PLAT_CLIENT_SECRET', '0baa5927164710b9f800bf33546b6da3'), "api_url" => env('PRE_PLAT_APP_URL', 'http://49.233.3.200:6304/api/thridapi/'), + "pharmacy_code" => env('PRE_PLAT_PHARMACY_CODE', 'ZD-10003'), // 药店编码 ], 'regulatory_platform' => [ // 四川省互联网医疗服务监管平台 "client_id" => env('REG_PLAT_CLIENT_ID', '09b117f8d1eb4dbfbf565447205ea60f'), diff --git a/extend/Prescription/Prescription.php b/extend/Prescription/Prescription.php index 752611a..91925e4 100644 --- a/extend/Prescription/Prescription.php +++ b/extend/Prescription/Prescription.php @@ -28,6 +28,7 @@ class Prescription protected string $api_url; protected string $client_id; protected string $client_secret; + protected string $pharmacy_code; protected array $header; public string $version = "v1"; @@ -36,6 +37,7 @@ class Prescription $this->api_url = config('prescription_platform.api_url'); $this->client_id = config('prescription_platform.client_id'); $this->client_secret = config('prescription_platform.client_secret'); + $this->pharmacy_code = config('prescription_platform.pharmacy_code'); $this->container = ApplicationContext::getContainer(); $this->client = $this->container->get(Client::class); } @@ -130,7 +132,7 @@ class Prescription { $option = [ "json" => array( - "pharmacyCode" => "ZD-10003", + "pharmacyCode" => $this->pharmacy_code, "drugCode" => $product_platform_code, ), ]; @@ -159,7 +161,7 @@ class Prescription { $option = [ "json" => array( - "pharmacyCode" => "JG-10009", + "pharmacyCode" => $this->pharmacy_code, ), ]; @@ -251,7 +253,7 @@ class Prescription */ protected function httpRequest(string $path,array $arg = []): array { - if ($path != "http://49.233.3.200:6304/api/thridapi/v1/user_thrid/token"){ + if ($path != $this->api_url . "v1/user_thrid/token"){ $this->redis = $this->container->get(Redis::class); $access_token = $this->redis->get("prescription_token"); diff --git a/hospital-deploy.sh b/hospital-deploy.sh index a5c99a0..60ba83c 100644 --- a/hospital-deploy.sh +++ b/hospital-deploy.sh @@ -3,96 +3,6 @@ #cd /Users/wucongxing/Desktop/work/php/hospital-applets-api || exit cd /data/www/hospital-applets-api || exit -#构建env -echo " -APP_NAME=gdxz -APP_ENV=dev -DOMAIN_NAME_DEV=https://dev.hospital.applets.igandanyiyuan.com/ -DOMAIN_NAME_PROD=https://dev.hospital.applets.igandanyiyuan.com/ - -# [mysql] -DB_DRIVER=mysql -DB_HOST=121.5.206.61 -DB_PORT=3306 -DB_DATABASE=internet_hospital -DB_USERNAME=root -DB_PASSWORD=Wucongxing1.. -DB_CHARSET=utf8mb4 -DB_COLLATION=utf8mb4_unicode_ci -DB_PREFIX=gdxz_ - -# [redis] -REDIS_HOST=121.5.206.61 -REDIS_AUTH=Wucongxing1.. -REDIS_PORT=6379 -REDIS_DB=0 - -# [jwt] -JWT_SECRET=X8p44RvrFDlnrvHLN2juwK1sSAlFtfvdZJLLKt97DLf50W7TPOzCKDUZdVkW+PZzWIqPT8fyoXGBAcBK2faHiA== -JWT_TTL=604800 -JWT_ALGO=HS256 - -# [PATIENT] -# [WECHAT] -PATIENT_WECHAT_APP_ID=wx70a196902e0841b6 -PATIENT_WECHAT_APP_SECRET=2671d2f4285180ddec5a5a2b16ed50f2 -PATIENT_WECHAT_INQUIRY_PAY_NOTIFY_URL=callback/wxpay/inquiry/success -PATIENT_WECHAT_INQUIRY_REFUND_NOTIFY_URL=callback/wxpay/inquiry/refund -PATIENT_WECHAT_PRODUCT_PAY_NOTIFY_URL=callback/wxpay/product/success -PATIENT_WECHAT_PRODUCT_REFUND_NOTIFY_URL=callback/wxpay/product/refund - -# [DOCTOR] -# [WECHAT] -DOCTOR_WECHAT_APP_ID=wxc83296720404aa7b -DOCTOR_WECHAT_APP_SECRET=817665d3763637fe66d56548f8484622 - -# [AMQP] -AMQP_HOST=42.193.16.243 -AMQP_PORT=5672 -AMQP_USER=gdxz_2022rabbitmq -AMQP_PASSWORD=qwr2p&¥e@3.2p -AMQP_VHOST=gdxz_2022rabbitmq - -# [CA-offline] -CA_OFFLINE_APP_ID=SCCA1560150113940832258 -CA_OFFLINE_APP_SECRET=facded39929f4aef9893cb766cd52e25 -CA_OFFLINE_API_URL=http://testmicrosrv.scca.com.cn:9527 - -# [CA-online] -CA_ONLINE_APP_ID=SCCA1646691325903052802 -CA_ONLINE_APP_SECRET=adf718ebc1fb4bb7b158de9117d1313a -CA_ONLINE_API_URL=http://testmicrosrv.scca.com.cn:9527 - -# [处方平台] -PRE_PLAT_CLIENT_ID=ZD-004 -PRE_PLAT_CLIENT_SECRET=0baa5927164710b9f800bf33546b6da3 -PRE_PLAT_APP_URL=http://49.233.3.200:6304/api/thridapi/ - -# [四川省互联网医疗服务监管平台] -REG_PLAT_CLIENT_ID=09b117f8d1eb4dbfbf565447205ea60f -REG_PLAT_CLIENT_SECRET=dcfd9223a3f448b0aae83ce22cdcc015 -REG_PLAT_APP_URL=https://202.61.88.184:19200/ - - -# [快递100] -LOGISTICS_KEY=Mpjjgebe8764 -LOGISTICS_CUSTOMER=EA3A55C09C524BDB72AE31231721B20F -LOGISTICS_APP_URL=https://poll.kuaidi100.com/poll/query.do -LOGISTICS_SALT=gdxz2023.d - -# [阿里云OSS] -OSS_ACCESS_KEY=LTAI5tKmFrVCghcxX7yHyGhm -OSS_ACCESS_KEY_SECRET=q1aiIZCJJuf92YbKk2cSXnPES4zx26 -OSS_BUCKET=gdxz-hospital -OSS_ENDPOINT=oss-cn-chengdu.aliyuncs.com -OSS_CUSTOM_DOMAIN_NAME=https://img.applets.igandanyiyuan.com -OSS_ENV=applet-dev - -# [阿里云短信] -DYSMS_ACCESSKEY=LTAI4GGygjsKhyBwvvC3CghV -DYSMS_ACCESSKEY_SECRET=rcx7lO9kQxG10m8NqNPEfEtT9IS8EI -">.env - #nginx_upstrame="/Users/wucongxing/Desktop/test/hospital-upstream.conf" nginx_upstrame="/etc/nginx/upstream/hospital-upstream.conf" #echo nginx_upstrame @@ -138,9 +48,6 @@ upstream hospital { echo "$upstrame" > $nginx_upstrame -# 复制证书 -#cp -r /data/www/cret/wechat/pay/1636644248/ ./extend/Wechat/certs/ - #获取可用端口镜像数量 image=$(docker images "hospital-applets-api-$reload_port" | wc -l) if [[ $image -eq 1 ]];then @@ -157,7 +64,7 @@ else fi echo '启动新端口容器' -docker run --name "hospital-applets-api-$reload_port" -d -p "$reload_port":9501 -v /var/log/hospital-applets-api/:/opt/www/runtime/logs "hospital-applets-api-$reload_port":latest +docker run --name "hospital-applets-api-$reload_port" --restart=always -d -p "$reload_port":9501 -v /var/log/hospital-applets-api/:/opt/www/runtime/logs "hospital-applets-api-$reload_port":latest echo '重启nginx' nginx -s reload