Преглед на файлове

feat: integrate task service and status badges into order management views

jerry преди 1 месец
родител
ревизия
169fd2a663
променени са 3 файла, в които са добавени 273 реда и са изтрити 63 реда
  1. 149 16
      src/components/admin/orders/OrderDetailDrawer.tsx
  2. 114 47
      src/components/admin/orders/OrderTable.tsx
  3. 10 0
      src/lib/services/taskService.ts

+ 149 - 16
src/components/admin/orders/OrderDetailDrawer.tsx

@@ -22,12 +22,13 @@ import {
   Coins,
   CheckCircle2,
   Eye,
+  Sparkles,
 } from 'lucide-react';
 import LocalTime from '@/components/common/LocalTime';
 import { getPaymentProviderIcon } from '@/components/admin/payments/paymentIcons';
 import { ExtendedOrderDetail, PaymentRecord } from '@/types';
 import { toast } from 'react-hot-toast';
-import { paymentService, orderService, userService } from '@/lib/services';
+import { paymentService, orderService, userService, taskService } from '@/lib/services';
 import { getCurrencySymbol } from '@/lib/currency';
 
 const FIELD_DISPLAY_ORDER = [
@@ -95,6 +96,8 @@ export default function OrderDetailDrawer({
   const [loadingPayments, setLoadingPayments] = useState<boolean>(false);
   const [events, setEvents] = useState<any[]>([]);
   const [loadingEvents, setLoadingEvents] = useState<boolean>(false);
+  const [task, setTask] = useState<any>(null);
+  const [loadingTask, setLoadingTask] = useState<boolean>(false);
   const [userData, setUserData] = useState<any>(null);
   const [loadingUser, setLoadingUser] = useState<boolean>(false);
   const [qrDetails, setQrDetails] = useState<Record<number, PaymentQrDetail>>({});
@@ -105,16 +108,35 @@ export default function OrderDetailDrawer({
     if (isOpen && order) {
       fetchPayments(order.id);
       fetchEvents(order.id);
+      fetchTask(order.id);
       if (order.user_id) {
         fetchUserDetails(order.user_id);
       }
     } else {
       setPaymentList([]);
       setEvents([]);
+      setTask(null);
       setUserData(null);
     }
   }, [isOpen, order]);
 
+  const fetchTask = async (orderId: string) => {
+    setLoadingTask(true);
+    try {
+      const res = await taskService.getByOrder(orderId);
+      const list = Array.isArray(res?.data) ? res.data : Array.isArray(res) ? res : [];
+      if (list.length > 0) {
+        setTask(list[0]);
+      } else {
+        setTask(null);
+      }
+    } catch {
+      setTask(null);
+    } finally {
+      setLoadingTask(false);
+    }
+  };
+
   const fetchPayments = async (orderId: string) => {
     setLoadingPayments(true);
     try {
@@ -233,6 +255,99 @@ export default function OrderDetailDrawer({
   const displayNickname = userData?.nickname || order.user_name || order.user?.nickname || order.applicant_name || '-';
   const displayPhone = userData?.phone || order.user?.phone || '-';
 
+  const renderTaskBadge = (t: any) => {
+    if (!t) return null;
+    const status = (t.status || '').toLowerCase();
+    const attempts = t.attempt_count ?? 0;
+    const grabbed = t.grabbed_history || {};
+    const tooltip = `任务 #${t.id} | 监控队列: ${t.routing_key || '未指定'} | 累计尝试: ${attempts}次`;
+
+    switch (status) {
+      case 'running':
+        return (
+          <span
+            className="px-2 py-0.5 bg-emerald-100 text-emerald-950 border border-emerald-600 text-[10px] font-black uppercase shadow-[1px_1px_0px_#000] flex items-center gap-1 cursor-default"
+            title={tooltip}
+          >
+            <span className="w-1.5 h-1.5 rounded-full bg-emerald-500 animate-ping inline-block" />
+            <span>⚡ 抢位中 ({attempts.toLocaleString()}次)</span>
+          </span>
+        );
+      case 'grabbed':
+        return (
+          <div className="flex items-center gap-1 flex-wrap" title={tooltip}>
+            <span className="px-2 py-0.5 bg-amber-300 text-black border border-black text-[10px] font-black uppercase shadow-[1px_1px_0px_#000] flex items-center gap-1 cursor-default">
+              <Sparkles size={10} className="text-black" />
+              <span>🏆 考位已锁定</span>
+            </span>
+            {grabbed.slot_date && (
+              <span className="px-1.5 py-0.5 bg-white border border-black text-[10px] font-mono font-black text-amber-950">
+                📅 {grabbed.slot_date} {grabbed.slot_time || ''}
+              </span>
+            )}
+            {grabbed.urn && (
+              <span
+                onClick={() => {
+                  navigator.clipboard.writeText(grabbed.urn);
+                  toast.success('已复制 URN 预约号');
+                }}
+                className="px-1.5 py-0.5 bg-white hover:bg-neutral-100 border border-black text-[10px] font-mono font-bold text-black cursor-pointer flex items-center gap-1 transition"
+                title="点击复制 URN"
+              >
+                <span>URN: {grabbed.urn}</span>
+                <Copy size={9} />
+              </span>
+            )}
+          </div>
+        );
+      case 'pending':
+        return (
+          <span
+            className="px-2 py-0.5 bg-sky-100 text-sky-950 border border-sky-400 text-[10px] font-bold uppercase cursor-default"
+            title={tooltip}
+          >
+            ⏳ 排队调度中 (P{t.priority ?? 10})
+          </span>
+        );
+      case 'pause':
+        return (
+          <span
+            className="px-2 py-0.5 bg-neutral-200 text-neutral-700 border border-neutral-400 text-[10px] font-bold uppercase cursor-default"
+            title={tooltip}
+          >
+            ⏸️ 抢号暂停
+          </span>
+        );
+      case 'completed':
+        return (
+          <span
+            className="px-2 py-0.5 bg-emerald-200 text-emerald-950 border border-emerald-600 text-[10px] font-bold uppercase cursor-default"
+            title={tooltip}
+          >
+            ✔ 抢号完成
+          </span>
+        );
+      case 'cancelled':
+        return (
+          <span
+            className="px-2 py-0.5 bg-neutral-100 text-neutral-500 border border-neutral-300 text-[10px] uppercase cursor-default"
+            title={tooltip}
+          >
+            ✕ 任务已取消
+          </span>
+        );
+      default:
+        return (
+          <span
+            className="px-2 py-0.5 bg-neutral-100 text-neutral-600 border border-black text-[10px] uppercase font-mono cursor-default"
+            title={tooltip}
+          >
+            {t.status || '未知'}
+          </span>
+        );
+    }
+  };
+
   return (
     <div className={`fixed inset-0 ${zIndex || 'z-50'} flex justify-end bg-black/60 backdrop-grayscale font-mono`}>
       <div className="absolute inset-0" onClick={onClose} />
@@ -265,21 +380,39 @@ export default function OrderDetailDrawer({
         </div>
 
         {/* Action Toolbar */}
-        <div className="bg-white px-5 py-2.5 border-b-2 border-black flex flex-wrap items-center justify-between gap-2 shrink-0">
-          <div className="flex items-center gap-2 text-xs">
-            <span className="font-bold text-neutral-500 uppercase">STATUS:</span>
-            <span
-              className={`px-2 py-0.5 border border-black text-[10px] font-black uppercase ${isPaid
-                ? 'bg-amber-300 text-black shadow-[1px_1px_0px_#000]'
-                : isPending
-                  ? 'bg-neutral-100 text-black'
-                  : isCancelled
-                    ? 'bg-neutral-200 text-neutral-600'
-                    : 'bg-rose-100 text-rose-800'
-                }`}
-            >
-              {order.status}
-            </span>
+        <div className="bg-white px-5 py-2.5 border-b-2 border-black flex flex-wrap items-center justify-between gap-2.5 shrink-0">
+          <div className="flex items-center gap-3 text-xs flex-wrap">
+            <div className="flex items-center gap-1.5">
+              <span className="font-bold text-neutral-500 uppercase">STATUS:</span>
+              <span
+                className={`px-2 py-0.5 border border-black text-[10px] font-black uppercase ${isPaid
+                  ? 'bg-amber-300 text-black shadow-[1px_1px_0px_#000]'
+                  : isPending
+                    ? 'bg-neutral-100 text-black'
+                    : isCancelled
+                      ? 'bg-neutral-200 text-neutral-600'
+                      : 'bg-rose-100 text-rose-800'
+                  }`}
+              >
+                {order.status}
+              </span>
+            </div>
+
+            <div className="flex items-center gap-1.5">
+              <span className="font-bold text-neutral-500 uppercase">TASK:</span>
+              {loadingTask ? (
+                <span className="flex items-center gap-1 text-[10px] text-neutral-400 font-mono">
+                  <Loader2 size={10} className="animate-spin text-neutral-500" />
+                  <span>查询中...</span>
+                </span>
+              ) : task ? (
+                renderTaskBadge(task)
+              ) : (
+                <span className="px-1.5 py-0.5 border border-neutral-300 text-neutral-400 text-[10px] font-mono uppercase bg-neutral-50">
+                  未挂载任务
+                </span>
+              )}
+            </div>
           </div>
 
           <div className="flex items-center gap-1.5">

+ 114 - 47
src/components/admin/orders/OrderTable.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import {
   Eye,
   XCircle,
@@ -47,6 +47,13 @@ export default function OrderTable({
   onDeleteOrder,
 }: OrderTableProps) {
   const [copiedId, setCopiedId] = useState<string | null>(null);
+  const [activeDropdownOrderId, setActiveDropdownOrderId] = useState<string | null>(null);
+
+  useEffect(() => {
+    const handleClickOutside = () => setActiveDropdownOrderId(null);
+    window.addEventListener('click', handleClickOutside);
+    return () => window.removeEventListener('click', handleClickOutside);
+  }, []);
 
   const handleCopy = (text: string, e: React.MouseEvent) => {
     e.stopPropagation();
@@ -255,7 +262,7 @@ export default function OrderTable({
             </tr>
           </thead>
           <tbody className="bg-white divide-y border-t-2 border-black">
-            {orders.map((order) => {
+            {orders.map((order, index) => {
               const isPending = (order.status || '').toLowerCase() === 'pending';
               const canMarkDone = onMarkCompleted && (order.status === 'paid' || order.status === 'succeeded' || order.status === 'completed') && (order.settlement_status === 'unsettled' || !order.settlement_status);
 
@@ -336,10 +343,11 @@ export default function OrderTable({
                   {/* Column 7: Actions */}
                   <td className="px-4 py-3.5 text-right whitespace-nowrap">
                     <div className="flex items-center justify-end gap-1.5" onClick={(e) => e.stopPropagation()}>
-                      {onRegisterPayment && (
+                      {/* 1. 高频核心动作:待收款显示[收款],待出签显示[履约] */}
+                      {onRegisterPayment && isPending && (
                         <button
                           onClick={() => onRegisterPayment(order)}
-                          className="px-2 py-1 bg-amber-300 hover:bg-amber-400 text-black border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1"
+                          className="px-2.5 py-1 bg-amber-300 hover:bg-amber-400 text-black border border-black text-xs font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 flex items-center gap-1"
                           title="登记客户实收金额并生成入账流水"
                         >
                           <DollarSign size={11} />
@@ -350,66 +358,125 @@ export default function OrderTable({
                       {canMarkDone && (
                         <button
                           onClick={() => onMarkCompleted?.(order.id)}
-                          className="px-2 py-1 bg-emerald-200 hover:bg-emerald-300 text-emerald-950 border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
+                          className="px-2.5 py-1 bg-emerald-200 hover:bg-emerald-300 text-emerald-950 border border-black text-xs font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
                           title="出签履约完成,开启T+7风险期"
                         >
                           履约
                         </button>
                       )}
 
+                      {/* 2. 查看详情主动作 */}
                       <button
-                        onClick={() => onCheckPayments(order)}
-                        className="px-2 py-1 bg-white hover:bg-neutral-100 text-black border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
-                        title="查看支付流水"
+                        onClick={() => onViewDetail(order)}
+                        className="px-2.5 py-1 bg-black text-white hover:bg-neutral-800 border border-black text-xs font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
+                        title="查阅全景档案与详情"
                       >
-                        流水
+                        详情
                       </button>
 
-                      {isPending && (
+                      {/* 3. 「···」更多二级操作下拉菜单 */}
+                      <div className="relative inline-block text-left">
                         <button
-                          onClick={() => onAdjustPrice(order)}
-                          className="px-2 py-1 bg-amber-300 hover:bg-amber-400 text-black border border-black text-[11px] font-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
-                          title="修改应付金额"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            setActiveDropdownOrderId((prev) => (prev === order.id ? null : order.id));
+                          }}
+                          className={`p-1 border border-black text-black shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition ${
+                            activeDropdownOrderId === order.id ? 'bg-amber-300' : 'bg-white hover:bg-neutral-100'
+                          }`}
+                          title="更多操作"
                         >
-                          调价
+                          <MoreHorizontal size={13} />
                         </button>
-                      )}
 
-                      <button
-                        onClick={() => onEdit(order)}
-                        className="px-2 py-1 bg-white hover:bg-neutral-100 text-black border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
-                        title="配置渠道来源、对接人及申报参数"
-                      >
-                        配置
-                      </button>
+                        {activeDropdownOrderId === order.id && (
+                          <div
+                            className={`absolute right-0 z-50 w-36 bg-white border-2 border-black shadow-[4px_4px_0px_#000] py-1 text-left font-mono text-xs ${
+                              index >= orders.length - 2 && orders.length > 2
+                                ? 'bottom-full mb-1'
+                                : 'top-full mt-1'
+                            }`}
+                            onClick={(e) => e.stopPropagation()}
+                          >
+                            {onRegisterPayment && !isPending && (
+                              <button
+                                onClick={() => {
+                                  setActiveDropdownOrderId(null);
+                                  onRegisterPayment(order);
+                                }}
+                                className="w-full text-left px-3 py-1.5 hover:bg-amber-100 font-bold flex items-center gap-1.5 text-black"
+                              >
+                                <DollarSign size={12} />
+                                <span>登记收款</span>
+                              </button>
+                            )}
 
-                      <button
-                        onClick={() => onViewDetail(order)}
-                        className="px-2 py-1 bg-black text-white hover:bg-neutral-800 border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
-                        title="查阅全景档案"
-                      >
-                        档案
-                      </button>
+                            <button
+                              onClick={() => {
+                                setActiveDropdownOrderId(null);
+                                onCheckPayments(order);
+                              }}
+                              className="w-full text-left px-3 py-1.5 hover:bg-neutral-100 font-bold flex items-center gap-1.5 text-black"
+                            >
+                              <Wallet size={12} />
+                              <span>支付流水</span>
+                            </button>
 
-                      {canCancel(order.status) && (
-                        <button
-                          onClick={() => onCancel(order.id)}
-                          className="px-2 py-1 bg-rose-100 hover:bg-rose-200 text-rose-800 border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5"
-                          title="取消该订单"
-                        >
-                          取消
-                        </button>
-                      )}
+                            {isPending && (
+                              <button
+                                onClick={() => {
+                                  setActiveDropdownOrderId(null);
+                                  onAdjustPrice(order);
+                                }}
+                                className="w-full text-left px-3 py-1.5 hover:bg-amber-100 font-bold flex items-center gap-1.5 text-black"
+                              >
+                                <DollarSign size={12} />
+                                <span>修改价格</span>
+                              </button>
+                            )}
 
-                      {onDeleteOrder && (
-                        <button
-                          onClick={() => onDeleteOrder(order)}
-                          className="px-2 py-1 bg-white hover:bg-rose-600 hover:text-white text-rose-600 border border-black text-[11px] font-bold shadow-[1px_1px_0px_#000] active:translate-x-0.5 active:translate-y-0.5 transition"
-                          title="彻底删除此订单及关联的所有流水、任务、事件(用于清理测试数据)"
-                        >
-                          删除
-                        </button>
-                      )}
+                            <button
+                              onClick={() => {
+                                setActiveDropdownOrderId(null);
+                                onEdit(order);
+                              }}
+                              className="w-full text-left px-3 py-1.5 hover:bg-neutral-100 font-bold flex items-center gap-1.5 text-black"
+                            >
+                              <Edit size={12} />
+                              <span>编辑配置</span>
+                            </button>
+
+                            {(canCancel(order.status) || onDeleteOrder) && (
+                              <div className="border-t border-black/20 my-1" />
+                            )}
+
+                            {canCancel(order.status) && (
+                              <button
+                                onClick={() => {
+                                  setActiveDropdownOrderId(null);
+                                  onCancel(order.id);
+                                }}
+                                className="w-full text-left px-3 py-1.5 hover:bg-rose-50 text-neutral-700 hover:text-rose-700 font-bold flex items-center gap-1.5"
+                              >
+                                <XCircle size={12} />
+                                <span>取消订单</span>
+                              </button>
+                            )}
+
+                            {onDeleteOrder && (
+                              <button
+                                onClick={() => {
+                                  setActiveDropdownOrderId(null);
+                                  onDeleteOrder(order);
+                                }}
+                                className="w-full text-left px-3 py-1.5 hover:bg-rose-600 hover:text-white text-rose-600 font-bold flex items-center gap-1.5 transition"
+                              >
+                                <span>彻底删除</span>
+                              </button>
+                            )}
+                          </div>
+                        )}
+                      </div>
                     </div>
                   </td>
                 </tr>

+ 10 - 0
src/lib/services/taskService.ts

@@ -33,6 +33,16 @@ export const taskService = {
     return res.data;
   },
 
+  /**
+   * 根据关联订单号查询任务
+   */
+  async getByOrder(orderId: string | number) {
+    const res = await api.get('/api/vas/task/get_by_order', {
+      params: { order_id: orderId },
+    });
+    return res.data;
+  },
+
   /**
    * 将任务重新放回调度队列
    */