This commit is contained in:
Your Name
2026-09-21 10:26:14 +08:00
parent bbe3e870a1
commit dbf474ddd7
67 changed files with 10636 additions and 279 deletions
@@ -45,6 +45,8 @@ class PrescriptionOrderLogic
{
private static string $error = '';
private const TRACKING_AUDIT_REQUIRED = '处方审核和支付单审核均通过后,才可填写或修改快递单号';
public static function setError(string $msg): void
{
self::$error = $msg;
@@ -55,6 +57,17 @@ class PrescriptionOrderLogic
return self::$error;
}
private static function assertTrackingAuditApproved(PrescriptionOrder $order): bool
{
if ((int) $order->prescription_audit_status !== 1 || (int) $order->payment_slip_audit_status !== 1) {
self::$error = self::TRACKING_AUDIT_REQUIRED;
return false;
}
return true;
}
private static function assertRemoteSnapshotMutable(PrescriptionOrder $order): bool
{
try {
@@ -990,6 +1003,12 @@ class PrescriptionOrderLogic
private static function createLocked(array $params, int $adminId, array $adminInfo)
{
self::$error = '';
// 新建业务订单的两项审核均为待审核,不能在创建时预填单号。
if (trim((string) ($params['tracking_number'] ?? '')) !== '') {
self::$error = self::TRACKING_AUDIT_REQUIRED;
return false;
}
$rxId = (int) $params['prescription_id'];
$diagId = (int) $params['diagnosis_id'];
$payOrderIds = self::normalizePayOrderIds($params['pay_order_ids'] ?? []);
@@ -1086,7 +1105,7 @@ class PrescriptionOrderLogic
$order->prev_staff = (string) ($params['prev_staff'] ?? '');
$order->service_channel = (string) ($params['service_channel'] ?? '');
$order->service_package = (string) ($params['service_package'] ?? '');
$order->tracking_number = (string) ($params['tracking_number'] ?? '');
$order->tracking_number = '';
$order->express_company = self::normalizeExpressCompany($params['express_company'] ?? 'auto');
$order->ship_mode = self::canSelectShipMode($adminInfo)
? self::normalizeShipMode((string) ($params['ship_mode'] ?? 'gancao'))
@@ -1867,6 +1886,15 @@ class PrescriptionOrderLogic
return false;
}
// 未提交单号时保留原值;仅实际填写、修改或清空单号需要双审核通过。
$trackingNumber = array_key_exists('tracking_number', $params)
? (string) $params['tracking_number']
: (string) ($order->tracking_number ?? '');
$trackingChanged = $trackingNumber !== (string) ($order->tracking_number ?? '');
if ($trackingChanged && !self::assertTrackingAuditApproved($order)) {
return false;
}
$medDays = $params['medication_days'] ?? null;
$medDays = $medDays === '' || $medDays === null ? null : (int) $medDays;
@@ -1892,7 +1920,7 @@ class PrescriptionOrderLogic
$order->prev_staff = (string) ($params['prev_staff'] ?? '');
$order->service_channel = (string) ($params['service_channel'] ?? '');
$order->service_package = (string) ($params['service_package'] ?? '');
$order->tracking_number = (string) ($params['tracking_number'] ?? '');
$order->tracking_number = $trackingNumber;
if (array_key_exists('express_company', $params)) {
$order->express_company = self::normalizeExpressCompany($params['express_company']);
}
@@ -1978,6 +2006,10 @@ class PrescriptionOrderLogic
$order->payment_slip_audit_status = 0;
$order->payment_slip_audit_remark = '';
}
// 同次编辑若让支付单重新进入待审核,也不能同时写入新的单号。
if ($trackingChanged && !self::assertTrackingAuditApproved($order)) {
return false;
}
self::syncFulfillmentStatus($order);
try {
@@ -2001,7 +2033,7 @@ class PrescriptionOrderLogic
}
/**
* 仅修改承运商与快递单号。物流信息不属于药房下单快照,因此允许在所有履约状态下修正。
* 双审核通过后,仅修改承运商与快递单号。物流信息不属于药房下单快照,不另设履约状态限制。
*
* @return array<string,mixed>|false
*/
@@ -2061,6 +2093,10 @@ class PrescriptionOrderLogic
return false;
}
if (!self::assertTrackingAuditApproved($order)) {
return false;
}
$oldTrackingNumber = trim((string) ($order->tracking_number ?? ''));
$oldExpressCompany = self::normalizeExpressCompany((string) ($order->express_company ?? 'auto'));
$newExpressCompany = self::normalizeExpressCompany($expressCompany);
@@ -2148,6 +2184,9 @@ class PrescriptionOrderLogic
return false;
}
if (!self::assertTrackingAuditApproved($order)) {
return false;
}
$shipMode = self::normalizeShipMode((string) ($order->ship_mode ?? 'gancao'));
$shipModeText = $shipMode === 'direct' ? '药房直发' : '甘草药方发';