Parcourir la source

fix(orders): 优化AI解析错误拦截与订单请求单号字符串透传防止NaN

jerry il y a 2 mois
Parent
commit
f7c6fc7042

+ 6 - 2
src/app/admin/orders/page.tsx

@@ -93,7 +93,7 @@ export default function AdminOrdersPage() {
     });
     if (!ok) return;
     try {
-      await orderService.cancel(Number(orderId));
+      await orderService.cancel(orderId);
       toast.success('订单已成功取消');
       fetchOrders(page);
       if (selectedOrder?.id === orderId) {
@@ -132,8 +132,12 @@ export default function AdminOrdersPage() {
   };
 
   const handleSubmitEdit = async (orderId: string, data: any) => {
+    if (!orderId) {
+      toast.error('无效的订单单号');
+      return;
+    }
     try {
-      await orderService.patchUserInputs(Number(orderId), data);
+      await orderService.patchUserInputs(orderId, data);
       toast.success('订单信息更新成功。');
       setIsEditOpen(false);
       fetchOrders(page);

+ 29 - 4
src/components/admin/orders/AiDataParserPanel.tsx

@@ -32,11 +32,36 @@ export default function AiDataParserPanel({ schemaId, onFieldsParsed }: AiDataPa
       });
 
       const responseData = res?.data || res;
-      const fieldsToFill = responseData?.parsed_obj || responseData;
 
-      if (fieldsToFill && typeof fieldsToFill === 'object') {
-        onFieldsParsed(fieldsToFill);
-        const count = Object.keys(fieldsToFill).length;
+      // 1. 检查是否存在 error:存在 error 即判定解析失败,终止后续处理,不回填任何字段
+      const errorMsg =
+        responseData?.error ||
+        (typeof responseData?.parsed_obj === 'object' && responseData.parsed_obj?.error);
+      if (errorMsg) {
+        toast.error(`AI 解析失败: ${errorMsg}`);
+        return;
+      }
+
+      // 2. 提取解析出的数据对象
+      const rawFields = responseData?.parsed_obj || responseData;
+
+      if (!rawFields || typeof rawFields !== 'object' || Array.isArray(rawFields)) {
+        toast.error('解析失败:未能识别有效数据');
+        return;
+      }
+
+      // 3. 过滤掉潜在的系统及错误保留字(error, message, code, status 等)
+      const ignoreKeys = new Set(['error', 'message', 'msg', 'code', 'status', 'detail']);
+      const cleanFields: Record<string, any> = {};
+      for (const [k, v] of Object.entries(rawFields)) {
+        if (!ignoreKeys.has(k) && v !== undefined && v !== null) {
+          cleanFields[k] = v;
+        }
+      }
+
+      const count = Object.keys(cleanFields).length;
+      if (count > 0) {
+        onFieldsParsed(cleanFields);
         toast.success(`AI 成功识别并填充了 ${count} 个字段!`);
       } else {
         toast.error('解析失败:未能识别有效数据');

+ 12 - 14
src/components/admin/orders/OrderDetailDrawer.tsx

@@ -106,7 +106,7 @@ export default function OrderDetailDrawer({
   const fetchPayments = async (orderId: string) => {
     setLoadingPayments(true);
     try {
-      const res = await paymentService.listByOrder(Number(orderId));
+      const res = await paymentService.listByOrder(orderId);
       const list = Array.isArray(res?.data) ? res.data : Array.isArray(res) ? res : [];
       setPaymentList(list);
     } catch {
@@ -119,7 +119,7 @@ export default function OrderDetailDrawer({
   const fetchEvents = async (orderId: string) => {
     setLoadingEvents(true);
     try {
-      const res = await orderService.getEvents(Number(orderId));
+      const res = await orderService.getEvents(orderId);
       const list = Array.isArray(res?.data) ? res.data : [];
       setEvents(list);
     } catch {
@@ -227,7 +227,7 @@ export default function OrderDetailDrawer({
 
       {/* Drawer Body */}
       <div className="relative w-full max-w-2xl bg-neutral-50 h-full border-l-2 border-black shadow-[8px_0px_0px_#000] flex flex-col z-10 animate-in slide-in-from-right duration-200 overflow-hidden">
-        
+
         {/* Drawer Header */}
         <div className="bg-neutral-200 px-5 py-3.5 border-b-2 border-black shrink-0 flex items-center justify-between select-none">
           <div className="flex items-center gap-2">
@@ -257,15 +257,14 @@ export default function OrderDetailDrawer({
           <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
+              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'
-              }`}
+                    ? 'bg-neutral-100 text-black'
+                    : isCancelled
+                      ? 'bg-neutral-200 text-neutral-600'
+                      : 'bg-rose-100 text-rose-800'
+                }`}
             >
               {order.status}
             </span>
@@ -309,7 +308,7 @@ export default function OrderDetailDrawer({
 
         {/* Scrollable Content */}
         <div className="flex-1 overflow-y-auto p-5 space-y-5 bg-neutral-50">
-          
+
           {/* 金额概览卡 */}
           <div className="bg-white border-2 border-black p-4 shadow-[3px_3px_0px_#000] flex flex-col sm:flex-row sm:items-center justify-between gap-3">
             <div>
@@ -461,9 +460,8 @@ export default function OrderDetailDrawer({
                               {formatMoney(pay.amount, pay.currency)}
                             </span>
                             <span
-                              className={`px-1.5 py-0.2 text-[10px] font-black uppercase border border-black ${
-                                isPaySucceeded ? 'bg-amber-300 text-black' : 'bg-neutral-200 text-neutral-600'
-                              }`}
+                              className={`px-1.5 py-0.2 text-[10px] font-black uppercase border border-black ${isPaySucceeded ? 'bg-amber-300 text-black' : 'bg-neutral-200 text-neutral-600'
+                                }`}
                             >
                               {pay.status}
                             </span>

+ 12 - 6
src/components/admin/orders/OrderEditModal.tsx

@@ -40,7 +40,13 @@ export default function OrderEditModal({ isOpen, onClose, order, onSubmit }: Ord
         user_inputs: parsedInputs,
       };
 
-      await onSubmit(order!.id, updateData);
+      if (!order?.id) {
+        toast.error('未获取到有效的订单编号');
+        setLoading(false);
+        return;
+      }
+
+      await onSubmit(order.id, updateData);
       toast.success('订单参数更新成功');
       onClose();
     } catch (error) {
@@ -55,7 +61,7 @@ export default function OrderEditModal({ isOpen, onClose, order, onSubmit }: Ord
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-grayscale p-4 font-mono">
       <div className="bg-neutral-50 border-2 border-black shadow-[8px_8px_0px_#000] w-full max-w-2xl overflow-hidden flex flex-col max-h-[90vh] animate-in zoom-in-95 duration-200">
-        
+
         {/* Header */}
         <div className="px-5 py-3.5 border-b-2 border-black flex justify-between items-center bg-neutral-200 text-black select-none">
           <div className="flex items-center gap-2 text-xs font-bold uppercase tracking-wider">
@@ -69,7 +75,7 @@ export default function OrderEditModal({ isOpen, onClose, order, onSubmit }: Ord
 
         {/* Content */}
         <div className="p-6 overflow-y-auto flex-1 space-y-4 bg-white">
-          
+
           <div className="bg-amber-50 border-2 border-black p-3 text-xs shadow-[2px_2px_0px_#000]">
             <div className="font-bold flex items-center gap-1.5 text-black uppercase mb-1">
               <AlertTriangle size={14} />
@@ -81,7 +87,7 @@ export default function OrderEditModal({ isOpen, onClose, order, onSubmit }: Ord
           </div>
 
           <div className="space-y-1">
-            <JsonEditor 
+            <JsonEditor
               label="申报参数 JSON (USER_INPUTS)"
               value={userInputsJson}
               onChange={setUserInputsJson}
@@ -94,13 +100,13 @@ export default function OrderEditModal({ isOpen, onClose, order, onSubmit }: Ord
 
         {/* Footer */}
         <div className="px-5 py-3 border-t-2 border-black bg-neutral-100 flex justify-end gap-3">
-          <button 
+          <button
             onClick={onClose}
             className="px-4 py-2 border-2 border-black bg-white hover:bg-neutral-200 text-black text-xs font-bold shadow-[2px_2px_0px_#000] transition active:translate-x-0.5 active:translate-y-0.5 uppercase"
           >
             [ 取消 ]
           </button>
-          <button 
+          <button
             onClick={handleSubmit}
             disabled={loading}
             className="px-6 py-2 bg-amber-300 hover:bg-amber-400 text-black border-2 border-black text-xs font-black shadow-[3px_3px_0px_#000] transition active:translate-x-0.5 active:translate-y-0.5 active:shadow-none flex items-center gap-1.5 uppercase disabled:opacity-50"

+ 7 - 7
src/components/admin/orders/OrderPaymentModal.tsx

@@ -33,9 +33,10 @@ export default function OrderPaymentModal({
   }, [isOpen, order]);
 
   const fetchPayments = async () => {
+    if (!order?.id) return;
     setLoading(true);
     try {
-      const res = await paymentService.listByOrder(Number(order?.id));
+      const res = await paymentService.listByOrder(order.id);
       const list = Array.isArray(res?.data) ? res.data : Array.isArray(res) ? res : [];
       setPayments(list);
     } catch {
@@ -152,13 +153,12 @@ export default function OrderPaymentModal({
                           {p.currency === 'CNY' ? '¥' : p.currency} {(p.amount / 100).toFixed(2)}
                         </span>
                         <span
-                          className={`px-1.5 py-0.2 text-[10px] font-black uppercase border border-black ${
-                            isSucceeded
+                          className={`px-1.5 py-0.2 text-[10px] font-black uppercase border border-black ${isSucceeded
                               ? 'bg-amber-300 text-black'
                               : isFailed
-                              ? 'bg-neutral-200 text-neutral-500'
-                              : 'bg-white text-black'
-                          }`}
+                                ? 'bg-neutral-200 text-neutral-500'
+                                : 'bg-white text-black'
+                            }`}
                         >
                           {p.status}
                         </span>
@@ -199,7 +199,7 @@ export default function OrderPaymentModal({
 
         {/* Footer */}
         <div className="px-5 py-3 border-t-2 border-black bg-neutral-100 flex justify-end">
-          <button 
+          <button
             onClick={onClose}
             className="px-5 py-1.5 bg-white hover:bg-neutral-200 text-black border-2 border-black text-xs font-bold shadow-[2px_2px_0px_#000] transition active:translate-x-0.5 active:translate-y-0.5 uppercase"
           >

+ 6 - 7
src/components/admin/orders/OrderPriceAdjustModal.tsx

@@ -59,7 +59,7 @@ export default function OrderPriceAdjustModal({
 
     setLoading(true);
     try {
-      await orderService.adjustPrice(Number(order.id), {
+      await orderService.adjustPrice(order.id, {
         adjustment_delta: deltaCents,
         reason: formData.reason,
       });
@@ -77,7 +77,7 @@ export default function OrderPriceAdjustModal({
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-grayscale p-4 font-mono">
       <div className="bg-neutral-50 border-2 border-black shadow-[8px_8px_0px_#000] w-full max-w-md overflow-hidden animate-in zoom-in-95 duration-200">
-        
+
         {/* Header */}
         <div className="px-5 py-3.5 border-b-2 border-black flex justify-between items-center bg-neutral-200 text-black select-none">
           <div className="flex items-center gap-2 text-xs font-bold uppercase tracking-wider">
@@ -108,13 +108,12 @@ export default function OrderPriceAdjustModal({
 
               <div className="flex items-center gap-1">
                 <span
-                  className={`px-1.5 py-0.5 border border-black text-xs ${
-                    deltaValue < 0
+                  className={`px-1.5 py-0.5 border border-black text-xs ${deltaValue < 0
                       ? 'bg-amber-200 text-black'
                       : deltaValue > 0
-                      ? 'bg-rose-100 text-rose-800'
-                      : 'bg-neutral-200 text-black'
-                  }`}
+                        ? 'bg-rose-100 text-rose-800'
+                        : 'bg-neutral-200 text-black'
+                    }`}
                 >
                   {deltaValue > 0 ? `+${deltaValue.toFixed(2)}` : deltaValue.toFixed(2)}
                 </span>

+ 11 - 11
src/components/admin/orders/OrderTable.tsx

@@ -1,17 +1,17 @@
 'use client';
 
 import { useState } from 'react';
-import { 
-  Eye, 
-  XCircle, 
-  User, 
-  Box, 
-  Edit, 
-  Clock, 
-  Wallet, 
-  DollarSign, 
-  Copy, 
-  Check, 
+import {
+  Eye,
+  XCircle,
+  User,
+  Box,
+  Edit,
+  Clock,
+  Wallet,
+  DollarSign,
+  Copy,
+  Check,
   MoreHorizontal,
   ChevronRight,
   Sparkles,

+ 7 - 7
src/lib/services/orderService.ts

@@ -31,7 +31,7 @@ export const orderService = {
   /**
    * 获取订单详情
    */
-  async getDetail(orderId: number) {
+  async getDetail(orderId: string | number) {
     const res = await api.get('/api/vas/order/detail', {
       params: { order_id: orderId },
     });
@@ -57,7 +57,7 @@ export const orderService = {
   /**
    * 取消订单
    */
-  async cancel(orderId: number) {
+  async cancel(orderId: string | number) {
     const res = await api.post('/api/vas/order/cancel', null, {
       params: { order_id: orderId },
     });
@@ -67,7 +67,7 @@ export const orderService = {
   /**
    * 管理员更新订单状态
    */
-  async updateStatus(orderId: number, payload: { status: string; [key: string]: any }) {
+  async updateStatus(orderId: string | number, payload: { status: string; [key: string]: any }) {
     const res = await api.post('/api/vas/order/admin_update_status', payload, {
       params: { order_id: orderId },
     });
@@ -77,7 +77,7 @@ export const orderService = {
   /**
    * 修改订单用户输入数据 (JSON Patch)
    */
-  async patchUserInputs(orderId: number, payload: Record<string, any>) {
+  async patchUserInputs(orderId: string | number, payload: Record<string, any>) {
     const res = await api.post('/api/vas/order/patch_user_inputs', payload, {
       params: { order_id: orderId },
     });
@@ -87,7 +87,7 @@ export const orderService = {
   /**
    * 后台调整订单价格 (优惠 / 减免 / 附加费)
    */
-  async adjustPrice(orderId: number, payload: Record<string, any>) {
+  async adjustPrice(orderId: string | number, payload: Record<string, any>) {
     const res = await api.post('/api/vas/order/adjust_price', payload, {
       params: { order_id: orderId },
     });
@@ -97,7 +97,7 @@ export const orderService = {
   /**
    * 获取订单生命周期事件日志
    */
-  async getEvents(orderId: number) {
+  async getEvents(orderId: string | number) {
     try {
       const res = await api.get('/api/vas/order-event/list', {
         params: { order_id: orderId },
@@ -114,7 +114,7 @@ export const orderService = {
   /**
    * AI 智能解析表单数据 (LLM Data Parsing)
    */
-  async parseDataWithLlm(payload: { raw_text?: string; input_raw_str?: string; schema_id?: string | number; [key: string]: any }) {
+  async parseDataWithLlm(payload: { raw_text?: string; input_raw_str?: string; schema_id?: string | number;[key: string]: any }) {
     const res = await api.post('/api/vas/llm/data_parsing', payload);
     return res.data;
   },

+ 1 - 1
src/lib/services/paymentService.ts

@@ -62,7 +62,7 @@ export const paymentService = {
   /**
    * 查询指定订单下的所有支付记录
    */
-  async listByOrder(orderId: number) {
+  async listByOrder(orderId: string | number) {
     const res = await api.get('/api/vas/payment/list_by_order', {
       params: { order_id: orderId },
     });