更新

server/app/adminapi/controller/tcm/PrescriptionOrderController.php

@@ -131,6 +131,26 @@ class PrescriptionOrderController extends BaseAdminController
         return $this->success('保存成功', $result);
     }
 
+    /**
+     * 仅修改承运商与快递单号，不受订单履约状态或远端药房快照锁限制。
+     */
+    public function ddcode()
+    {
+        $params = (new PrescriptionOrderValidate())->post()->goCheck('ddcode');
+        $result = PrescriptionOrderLogic::ddcode(
+            (int) $params['id'],
+            (string) ($params['express_company'] ?? 'auto'),
+            (string) $params['tracking_number'],
+            $this->adminId,
+            $this->adminInfo
+        );
+        if ($result === false) {
+            return $this->fail(PrescriptionOrderLogic::getError());
+        }
+
+        return $this->success('快递单号已保存', $result);
+    }
+
     public function updateAmount()
     {
         $params = (new PrescriptionOrderValidate())->post()->goCheck('updateAmount');

server/app/adminapi/logic/tcm/PrescriptionOrderLogic.php

@@ -1904,21 +1904,72 @@ class PrescriptionOrderLogic
     }
 
     /**
-     * 甘草已提交后仅更新物流字段（tracking_number、express_company），忽略金额/地址等其它请求参数。
+     * 仅修改承运商与快递单号。物流信息不属于药房下单快照，因此允许在所有履约状态下修正。
      *
-     * @param array<string,mixed> $params
      * @return array<string,mixed>|false
      */
-    private static function editGancaoLogisticsOnly(
-        PrescriptionOrder $order,
-        array $params,
+    public static function ddcode(
+        int $id,
+        string $expressCompany,
+        string $trackingNumber,
         int $adminId,
         array $adminInfo
     ) {
-        $order->tracking_number = mb_substr(trim((string) ($params['tracking_number'] ?? '')), 0, 80);
-        if (array_key_exists('express_company', $params)) {
-            $order->express_company = self::normalizeExpressCompany($params['express_company']);
+        self::setError('');
+        try {
+            return LockedPharmacySnapshotMutation::execute(
+                $id,
+                static fn () => self::ddcodeLocked(
+                    $id,
+                    $expressCompany,
+                    $trackingNumber,
+                    $adminId,
+                    $adminInfo
+                ),
+                false
+            );
+        } catch (\Throwable $exception) {
+            if (self::getError() === '') {
+                self::setError($exception->getMessage());
+            }
+            return false;
         }
+    }
+
+    /** @return array<string,mixed>|false */
+    private static function ddcodeLocked(
+        int $id,
+        string $expressCompany,
+        string $trackingNumber,
+        int $adminId,
+        array $adminInfo
+    ) {
+        self::$error = '';
+        $trackingNumber = mb_substr(trim($trackingNumber), 0, 80);
+        if ($trackingNumber === '') {
+            self::$error = '快递单号不能为空';
+
+            return false;
+        }
+
+        $order = PrescriptionOrder::where('id', $id)->whereNull('delete_time')->find();
+        if (!$order) {
+            self::$error = '订单不存在';
+
+            return false;
+        }
+        if (!self::canAccessOrder($order, $adminId, $adminInfo)) {
+            self::$error = '无权限操作';
+
+            return false;
+        }
+
+        $oldTrackingNumber = trim((string) ($order->tracking_number ?? ''));
+        $oldExpressCompany = self::normalizeExpressCompany((string) ($order->express_company ?? 'auto'));
+        $newExpressCompany = self::normalizeExpressCompany($expressCompany);
+
+        $order->tracking_number = $trackingNumber;
+        $order->express_company = $newExpressCompany;
 
         try {
             $order->save();
@@ -1932,8 +1983,15 @@ class PrescriptionOrderLogic
             (int) $order->id,
             $adminId,
             $adminInfo,
-            'edit',
-            '甘草订单已提交，仅更新快递信息（单号/承运商）'
+            'fill_tracking',
+            sprintf(
+                '修改快递信息：单号「%s」→「%s」，承运商「%s」→「%s」',
+                $oldTrackingNumber !== '' ? $oldTrackingNumber : '空',
+                $trackingNumber,
+                $oldExpressCompany,
+                $newExpressCompany
+            ),
+            true
         );
 
         $out = $order->toArray();
@@ -5370,7 +5428,14 @@ class PrescriptionOrderLogic
         ];
     }
 
-    private static function writeLog(int $orderId, int $adminId, array $adminInfo, string $action, string $summary): void
+    private static function writeLog(
+        int $orderId,
+        int $adminId,
+        array $adminInfo,
+        string $action,
+        string $summary,
+        bool $strict = false
+    ): void
     {
         $adminName = $adminInfo['name'] ?? '';
         if ($adminName === '' && $adminId > 0) {
@@ -5388,7 +5453,10 @@ class PrescriptionOrderLogic
         try {
             $log->save();
         } catch (\Throwable $e) {
-            // 忽略日志写入错误
+            if ($strict) {
+                throw new \RuntimeException('操作日志写入失败，快递信息未保存', 0, $e);
+            }
+            // 非关键日志沿用历史容错行为
         }
     }
 

server/app/adminapi/validate/tcm/PrescriptionOrderValidate.php

@@ -59,6 +59,7 @@ class PrescriptionOrderValidate extends BaseValidate
         'action.require' => '请选择审核操作',
         'patient_name.require' => '请输入患者姓名',
         'phone.require' => '请输入手机号',
+        'tracking_number.require' => '请输入快递单号',
         'phone_tail.regex' => '手机后四位仅支持数字',
         'reason.require' => '请填写退款原因',
     ];
@@ -75,6 +76,7 @@ class PrescriptionOrderValidate extends BaseValidate
             'is_follow_up', 'prev_staff', 'service_channel', 'service_package',
             'tracking_number', 'express_company', 'fee_type', 'amount', 'remark_extra', 'remark_assistant', 'pay_order_ids',
         ],
+        'ddcode' => ['id', 'tracking_number', 'express_company'],
         'logisticsTrace' => ['id', 'phone_tail'],
         'logisticsJdUpdate' => ['id'],
         'auditPrescription' => ['id', 'action', 'remark'],
@@ -106,6 +108,14 @@ class PrescriptionOrderValidate extends BaseValidate
             ->append('amount', 'require|float|egt:0');
     }
 
+    public function ddcode(): PrescriptionOrderValidate
+    {
+        return $this->only(['id', 'tracking_number', 'express_company'])
+            ->append('id', 'require|integer|gt:0')
+            ->append('tracking_number', 'require|max:80')
+            ->append('express_company', 'max:20');
+    }
+
     public function patchPrescriptionUsage(): PrescriptionOrderValidate
     {
         return $this->only(['id', 'times_per_day', 'usage_days', 'medication_days', 'aux_times_per_day', 'aux_usage_days'])