diff --git a/backend/internal/service/rock_service.go b/backend/internal/service/rock_service.go index ebc76f9..402d94f 100644 --- a/backend/internal/service/rock_service.go +++ b/backend/internal/service/rock_service.go @@ -751,8 +751,8 @@ func (s *RockService) ListTokens(ctx context.Context, page, pageSize int, status } if strings.TrimSpace(search) != "" { term := "%" + strings.TrimSpace(search) + "%" - db = db.Where("assigned_order_no LIKE ? OR expected_uid LIKE ? OR actual_role_name LIKE ? OR actual_role_id LIKE ? OR redeem_code LIKE ? OR assigned_order_no IN (SELECT order_no FROM fulfillment_orders WHERE client_order_no LIKE ?)", - term, term, term, term, term, term) + db = db.Where("CAST(id AS TEXT) = ? OR upstream_token_id = ? OR upstream_token_id LIKE ? OR assigned_order_no LIKE ? OR expected_uid LIKE ? OR actual_role_name LIKE ? OR actual_role_id LIKE ? OR redeem_code LIKE ? OR assigned_order_no IN (SELECT order_no FROM fulfillment_orders WHERE client_order_no LIKE ?)", + strings.TrimSpace(search), strings.TrimSpace(search), term, term, term, term, term, term, term) } var total int64 diff --git a/frontend/src/pages/PlatformRock.tsx b/frontend/src/pages/PlatformRock.tsx index 25254e1..5876c75 100644 --- a/frontend/src/pages/PlatformRock.tsx +++ b/frontend/src/pages/PlatformRock.tsx @@ -294,19 +294,25 @@ export default function PlatformRock() { const columns: ColumnsType = [ { - title: 'ID / 提取码', - dataIndex: 'id', - width: 170, - render: (id, record) => ( + title: '0666 编号 / 提取码', + dataIndex: 'upstream_token_id', + width: 250, + render: (_, record) => ( - #{id} + 0666 #{record.upstream_token_id || '-'} + + - {record.redeem_code ? `${record.redeem_code.substring(0, 10)}...` : '-'} + {record.redeem_code || '-'} + 本地 #{record.id} ), }, @@ -933,12 +939,12 @@ export default function PlatformRock() { } value={searchKeyword} onChange={(e) => setSearchKeyword(e.target.value)} onPressEnter={loadTokens} - style={{ width: 280 }} + style={{ width: 340 }} allowClear />