更新

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

@@ -651,7 +651,7 @@ class PrescriptionOrderLogic
         $rows = Order::whereIn('id', $ids)->whereNull('delete_time')
             ->field(['id', 'order_no', 'order_type', 'amount', 'status', 'create_time', 'creator_id', 'remark', 'is_exempt'])
             ->order('id', 'asc')
-            ->whereIn('status', [2,5])
+            ->whereIn('status', [2, 4, 5])
             ->select()
             ->toArray();
       
@@ -709,7 +709,10 @@ class PrescriptionOrderLogic
         $arr['linked_pay_orders'] = self::linkedPayOrdersPayload($ids);
         $sum = 0.0;
         foreach ($arr['linked_pay_orders'] as $o) {
-            $sum += (float) ($o['amount'] ?? 0);
+            $st = (int) ($o['status'] ?? 0);
+            if ($st === 2 || $st === 5) {
+                $sum += (float) ($o['amount'] ?? 0);
+            }
         }
         $arr['linked_pay_paid_total'] = round($sum, 2);
         $arr['deposit_min_amount'] = self::depositMinAmount();
@@ -2457,7 +2460,10 @@ class PrescriptionOrderLogic
         $linkedPayOrders    = self::linkedPayOrdersPayload($linkedPayOrderIds);
         $linkedPayPaidTotal = 0.0;
         foreach ($linkedPayOrders as $o) {
-            $linkedPayPaidTotal += (float) ($o['amount'] ?? 0);
+            $st = (int) ($o['status'] ?? 0);
+            if ($st === 2 || $st === 5) {
+                $linkedPayPaidTotal += (float) ($o['amount'] ?? 0);
+            }
         }
         $linkedPayPaidTotal = round($linkedPayPaidTotal, 2);
       
@@ -2468,7 +2474,13 @@ class PrescriptionOrderLogic
             $order->fulfillment_status = $targetFulfillmentStatus;
         }
 
+        $refundedPayCount = 0;
         try {
+            if ($targetFulfillmentStatus === 10 && $linkedPayOrderIds !== []) {
+                $refundedPayCount = Order::whereIn('id', $linkedPayOrderIds)
+                    ->whereNull('delete_time')
+                    ->update(['status' => 4]);
+            }
             $order->save();
         } catch (\Throwable $e) {
             self::$error = $e->getMessage();
@@ -2484,6 +2496,9 @@ class PrescriptionOrderLogic
             $logLine = '订单完成，状态变更为「' . $label . '」，实付金额更新为 ¥' . $linkedPayPaidTotal . $unassignSummary;
         } else {
             $logLine = '订单处理完成，状态变更为「' . $label . '」' . $unassignSummary;
+            if ($targetFulfillmentStatus === 10 && $refundedPayCount > 0) {
+                $logLine .= '，关联支付单 ' . $refundedPayCount . ' 笔已标记为已退款';
+            }
         }
         self::writeLog(
             $id,