gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wucongxing 2023-05-16 11:28:53 +08:00
commit 22e09e2cc8
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/CallBackController.php
View File

@ -3,7 +3,6 @@
namespace App\Controller; namespace App\Controller;
use App\Amqp\Producer\AssignDoctorDelayDirectProducer; use App\Amqp\Producer\AssignDoctorDelayDirectProducer;
use App\Amqp\Producer\AssignDoctorProducer;
use App\Constants\DoctorTitleCode; use App\Constants\DoctorTitleCode;
use App\Constants\HttpEnumCode; use App\Constants\HttpEnumCode;
use App\Exception\BusinessException; use App\Exception\BusinessException;
@ -145,7 +144,7 @@ class CallBackController extends AbstractController
$data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
$message = new AssignDoctorDelayDirectProducer($data); $message = new AssignDoctorDelayDirectProducer($data);
$message->setDelayMs(1000 * 60 * 5); $message->setDelayMs(1000 * 5);
$producer = $this->container->get(Producer::class); $producer = $this->container->get(Producer::class);
$res = $producer->produce($message); $res = $producer->produce($message);
if (!$res) { if (!$res) {

7
app/Services/InquiryService.php
View File

@ -182,7 +182,12 @@ class InquiryService extends BaseService
$data = array(); $data = array();
$data['user_id'] = $user_info['user_id']; $data['user_id'] = $user_info['user_id'];
$data['patient_id'] = $user_info['client_user_id']; $data['patient_id'] = $user_info['client_user_id'];
$data['doctor_id'] = $request_params['doctor_id'] ?? null; if (isset($request_params['doctor_id'])){
if (!empty($request_params['doctor_id'])){
$data['doctor_id'] = $request_params['doctor_id'];
}
}
$data['family_id'] = $request_params['family_id']; $data['family_id'] = $request_params['family_id'];
$data['inquiry_type'] = $request_params['inquiry_type']; $data['inquiry_type'] = $request_params['inquiry_type'];
$data['inquiry_mode'] = $request_params['inquiry_mode']; $data['inquiry_mode'] = $request_params['inquiry_mode'];

3
app/Services/PatientOrderService.php
View File

@ -3,7 +3,6 @@
namespace App\Services; namespace App\Services;
use App\Amqp\Producer\AssignDoctorDelayDirectProducer; use App\Amqp\Producer\AssignDoctorDelayDirectProducer;
use App\Amqp\Producer\AssignDoctorProducer;
use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer; use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer;
use App\Constants\DoctorTitleCode; use App\Constants\DoctorTitleCode;
use App\Constants\HttpEnumCode; use App\Constants\HttpEnumCode;
@ -883,7 +882,7 @@ class PatientOrderService extends BaseService
$data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
$message = new AssignDoctorDelayDirectProducer($data); $message = new AssignDoctorDelayDirectProducer($data);
$message->setDelayMs(1000 * 60 * 5); $message->setDelayMs(1000 * 5);
$producer = $this->container->get(Producer::class); $producer = $this->container->get(Producer::class);
$res = $producer->produce($message); $res = $producer->produce($message);
if (!$res) { if (!$res) {

2
extend/Wechat/WechatPay.php
View File

@ -4,6 +4,7 @@ namespace Extend\Wechat;
use App\Constants\HttpEnumCode; use App\Constants\HttpEnumCode;
use App\Exception\BusinessException; use App\Exception\BusinessException;
use App\Utils\Log;
use EasyWeChat\Kernel\Exceptions\InvalidArgumentException; use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
use EasyWeChat\Kernel\Exceptions\InvalidConfigException; use EasyWeChat\Kernel\Exceptions\InvalidConfigException;
use EasyWeChat\OfficialAccount\Message; use EasyWeChat\OfficialAccount\Message;
@ -144,6 +145,7 @@ class WechatPay
] ]
]; ];
Log::getInstance()->info(json_encode($options,JSON_UNESCAPED_UNICODE));
try { try {
$response = $app->getClient()->postJson("v3/pay/transactions/jsapi", $options); $response = $app->getClient()->postJson("v3/pay/transactions/jsapi", $options);
if ($response->isFailed()) { if ($response->isFailed()) {