@@ -15,6 +15,7 @@
|
||||
namespace app\adminapi\logic\auth;
|
||||
|
||||
use app\adminapi\logic\LoginLogic;
|
||||
use app\adminapi\service\DoctorWebConsultationPolicy;
|
||||
use app\common\cache\AdminAuthCache;
|
||||
use app\common\enum\YesNoEnum;
|
||||
use app\common\logic\BaseLogic;
|
||||
@@ -318,6 +319,7 @@ class AdminLogic extends BaseLogic
|
||||
|
||||
$authRoleIds = AdminRole::where('admin_id', $params['id'])->column('role_id');
|
||||
$admin['role_ids'] = array_values(array_map('intval', $authRoleIds));
|
||||
$admin['web_consultation_policy'] = DoctorWebConsultationPolicy::publicPolicy();
|
||||
|
||||
$admin['need_bind_work_wechat'] = LoginLogic::adminMustBindWorkWechat([
|
||||
'root' => (int) ($admin['root'] ?? 0),
|
||||
|
||||
@@ -4,6 +4,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace app\adminapi\logic\order;
|
||||
|
||||
use app\adminapi\service\order\PaymentPrescriptionOrderService;
|
||||
use app\common\model\Order;
|
||||
use app\common\model\OrderDetail;
|
||||
use app\common\model\auth\Admin;
|
||||
@@ -776,7 +777,11 @@ class OrderLogic
|
||||
return null;
|
||||
}
|
||||
|
||||
return $order->toArray();
|
||||
$detail = $order->toArray();
|
||||
$prescriptionOrders = PaymentPrescriptionOrderService::forPaymentIds([$id]);
|
||||
$detail['prescription_orders'] = $prescriptionOrders[$id] ?? [];
|
||||
|
||||
return $detail;
|
||||
}
|
||||
|
||||
private static $error = '';
|
||||
|
||||
@@ -37,6 +37,36 @@ class DesktopWorkstationLogic extends BaseLogic
|
||||
public static function getConfig(): array
|
||||
{
|
||||
return self::present(self::loadStored());
|
||||
}
|
||||
|
||||
/** 医生公告使用的安装包清单,与自动升级检测开关独立。 */
|
||||
public static function downloads(): array
|
||||
{
|
||||
return self::downloadCatalog(self::getConfig());
|
||||
}
|
||||
|
||||
public static function downloadCatalog(array $config): array
|
||||
{
|
||||
$labels = [
|
||||
'windows_x64' => 'Windows 64位',
|
||||
'macos_arm64' => 'macOS(Apple芯片)',
|
||||
'macos_x64' => 'macOS(Intel芯片)',
|
||||
];
|
||||
$packages = [];
|
||||
foreach (self::PLATFORMS as $platform) {
|
||||
$package = self::plainPackage((array) ($config['packages'][$platform] ?? []), $platform);
|
||||
$url = parse_url($package['url']);
|
||||
if (!is_array($url) || !in_array(strtolower($url['scheme'] ?? ''), ['https', 'http'], true)
|
||||
|| empty($url['host']) || isset($url['user']) || isset($url['pass'])
|
||||
|| !preg_match('/^[a-f0-9]{64}$/', $package['sha256'])) {
|
||||
continue;
|
||||
}
|
||||
$packages[] = ['platform' => $platform, 'label' => $labels[$platform]] + $package;
|
||||
}
|
||||
return [
|
||||
'version' => self::normalizeVersion((string) ($config['latest_version'] ?? '')),
|
||||
'packages' => $packages,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user