From 0967ecc5db3b063c67092368316adf1db96aeaf4 Mon Sep 17 00:00:00 2001
From: yml2213 <a2213290201@gmail.com>
Date: Tue, 6 Oct 2026 11:49:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(rock):=20=E5=BA=93=E5=AD=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA=200666=20?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=92=8C=E5=AE=8C=E6=95=B4=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

本地序号和上游编号不是同一个，按 0666 上的编号就能对上库存和兑换记录。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 backend/internal/service/rock_service.go |  4 ++--
 frontend/src/pages/PlatformRock.tsx      | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

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<RockTokenItem> = [
     {
-      title: 'ID / 提取码',
-      dataIndex: 'id',
-      width: 170,
-      render: (id, record) => (
+      title: '0666 编号 / 提取码',
+      dataIndex: 'upstream_token_id',
+      width: 250,
+      render: (_, record) => (
         <Space direction="vertical" size={2}>
-          <Text code style={{ fontWeight: 600 }}>#{id}</Text>
           <Text
-            copyable={{ text: record.redeem_code }}
+            copyable={record.upstream_token_id ? { text: record.upstream_token_id } : false}
+            style={{ fontWeight: 600 }}
+          >
+            0666 #{record.upstream_token_id || '-'}
+          </Text>
+          <Text
+            copyable={record.redeem_code ? { text: record.redeem_code } : false}
             type="secondary"
             style={{ fontSize: 12, fontFamily: 'monospace' }}
           >
-            {record.redeem_code ? `${record.redeem_code.substring(0, 10)}...` : '-'}
+            {record.redeem_code || '-'}
           </Text>
+          <Text type="secondary" style={{ fontSize: 11 }}>本地 #{record.id}</Text>
         </Space>
       ),
     },
@@ -933,12 +939,12 @@ export default function PlatformRock() {
           <Col xs={24} md={16}>
             <Space size="middle" wrap>
               <Input
-                placeholder="搜索订单号 / UID / 角色名 / 提取码"
+                placeholder="搜索 0666 编号 / 提取码 / 订单号 / UID"
                 prefix={<SearchOutlined style={{ color: '#94a3b8' }} />}
                 value={searchKeyword}
                 onChange={(e) => setSearchKeyword(e.target.value)}
                 onPressEnter={loadTokens}
-                style={{ width: 280 }}
+                style={{ width: 340 }}
                 allowClear
               />
               <Radio.Group