From 364276d85bf4c24b05dff81ea027882541e8afc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=92?= <van666666@foxmail.com>
Date: Wed, 5 Nov 2025 22:47:11 +0800
Subject: [PATCH] 1

---
 src/api/jarvis/tendoc.js               |  17 ++++
 src/views/system/jdorder/orderList.vue | 122 +++++++++----------------
 2 files changed, 61 insertions(+), 78 deletions(-)

diff --git a/src/api/jarvis/tendoc.js b/src/api/jarvis/tendoc.js
index b262c51..b380c25 100644
--- a/src/api/jarvis/tendoc.js
+++ b/src/api/jarvis/tendoc.js
@@ -35,6 +35,23 @@ export function fillLogisticsByOrderNo(data) {
   })
 }
 
+// 获取token状态
+export function getTokenStatus() {
+  return request({
+    url: '/jarvis/tendoc/tokenStatus',
+    method: 'get'
+  })
+}
+
+// 设置token（用于首次授权）
+export function setToken(data) {
+  return request({
+    url: '/jarvis/tendoc/setToken',
+    method: 'post',
+    data
+  })
+}
+
 // 追加单个订单物流信息
 export function appendLogistics(data) {
   return request({
diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index e38f107..72a9d93 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -278,22 +278,20 @@
       width="600px"
       :close-on-click-modal="false"
     >
+      <el-alert
+        v-if="tokenStatusChecked && !tokenValid"
+        title="访问令牌未配置或已过期"
+        type="warning"
+        :closable="false"
+        style="margin-bottom: 20px;"
+      >
+        <template slot="default">
+          <p>请先完成授权并保存访问令牌。</p>
+          <p>获取授权URL后，完成授权，从回调页面复制access_token和refresh_token，然后调用设置token接口保存。</p>
+        </template>
+      </el-alert>
+      
       <el-form :model="syncLogisticsForm" label-width="140px">
-        <el-form-item label="访问令牌">
-          <el-input
-            v-model="syncLogisticsForm.accessToken"
-            placeholder="点击下方按钮获取授权"
-            style="width: 100%"
-          />
-          <el-button
-            type="primary"
-            size="small"
-            style="margin-top: 8px;"
-            @click="handleAuthorize"
-          >
-            获取授权
-          </el-button>
-        </el-form-item>
         <el-form-item label="文件ID" required>
           <el-input
             v-model="syncLogisticsForm.fileId"
@@ -342,7 +340,7 @@
         </el-form-item>
         <el-form-item label="说明">
           <div style="font-size: 12px; color: #666; line-height: 1.6;">
-            <p>1. 首次使用需要点击"获取授权"按钮完成腾讯文档授权</p>
+            <p>1. 系统会自动使用后端保存的访问令牌，无需手动输入</p>
             <p>2. 文件ID和工作表ID可以从腾讯文档URL中获取</p>
             <p>3. 系统会自动从上次处理的最大行数-100开始读取，避免重复处理历史数据</p>
             <p>4. 配置会自动保存，下次使用时无需重新填写</p>
@@ -355,6 +353,7 @@
           type="primary"
           :loading="syncLogisticsLoading"
           @click="handleSyncLogisticsSubmit"
+          :disabled="tokenStatusChecked && !tokenValid"
         >
           开始同步
         </el-button>
@@ -365,7 +364,7 @@
 
 <script>
 import { listJDOrders, updateJDOrder, delJDOrder, fetchLogisticsManually } from '@/api/system/jdorder'
-import { fillLogisticsByOrderNo, getTencentDocAuthUrl, getTencentDocAccessToken } from '@/api/jarvis/tendoc'
+import { fillLogisticsByOrderNo, getTokenStatus } from '@/api/jarvis/tendoc'
 import ListLayout from '@/components/ListLayout'
 
 export default {
@@ -400,7 +399,6 @@ export default {
       syncLogisticsDialogVisible: false,
       syncLogisticsLoading: false,
       syncLogisticsForm: {
-        accessToken: '',
         fileId: '',
         sheetId: '',
         headerRow: 1,
@@ -408,6 +406,8 @@ export default {
         logisticsLinkColumn: null
       },
       currentOrder: null,
+      tokenValid: false,
+      tokenStatusChecked: false,
       // 获取物流信息对话框
       fetchLogisticsDialogVisible: false,
       fetchLogisticsLoading: false,
@@ -640,7 +640,7 @@ export default {
     },
     
     /** 同步物流到腾讯文档 */
-    handleSyncLogistics(row) {
+    async handleSyncLogistics(row) {
       // 检查是否有物流链接
       if (!row.logisticsLink || !row.logisticsLink.trim()) {
         this.$message.warning('该订单暂无物流链接，无法同步')
@@ -649,6 +649,8 @@ export default {
       
       this.currentOrder = row
       this.syncLogisticsDialogVisible = true
+      this.tokenStatusChecked = false
+      this.tokenValid = false
       
       // 从localStorage获取之前保存的配置
       const savedConfig = localStorage.getItem('tendoc_sync_config')
@@ -664,74 +666,31 @@ export default {
         }
       }
       
-      // 检查是否有访问令牌，如果没有则引导授权
-      if (!this.syncLogisticsForm.accessToken) {
-        this.handleAuthorize()
-      }
+      // 检查后端token状态
+      await this.checkTokenStatus()
     },
     
-    /** 腾讯文档授权 */
-    async handleAuthorize() {
+    /** 检查后端token状态 */
+    async checkTokenStatus() {
       try {
-        const res = await getTencentDocAuthUrl()
+        const res = await getTokenStatus()
         if (res.code === 200 && res.data) {
-          // 打开授权页面
-          const authUrl = res.data
-          const width = 600
-          const height = 700
-          const left = (window.screen.width - width) / 2
-          const top = (window.screen.height - height) / 2
-          
-          // 监听来自授权回调页面的消息
-          const messageHandler = (event) => {
-            if (event.data && event.data.type === 'tendoc_auth_success') {
-              window.removeEventListener('message', messageHandler)
-              this.syncLogisticsForm.accessToken = event.data.access_token
-              // 保存配置
-              localStorage.setItem('tendoc_sync_config', JSON.stringify(this.syncLogisticsForm))
-              this.$message.success('授权成功，访问令牌已自动保存')
-            }
-          }
-          
-          window.addEventListener('message', messageHandler)
-          
-          // 打开授权窗口
-          const authWindow = window.open(
-            authUrl,
-            '腾讯文档授权',
-            `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`
-          )
-          
-          // 如果窗口关闭，检查localStorage是否有新的token
-          const checkWindow = setInterval(() => {
-            if (authWindow.closed) {
-              clearInterval(checkWindow)
-              window.removeEventListener('message', messageHandler)
-              
-              // 检查localStorage是否有新的token
-              const token = localStorage.getItem('tendoc_access_token')
-              if (token && token !== this.syncLogisticsForm.accessToken) {
-                this.syncLogisticsForm.accessToken = token
-                localStorage.setItem('tendoc_sync_config', JSON.stringify(this.syncLogisticsForm))
-                this.$message.success('授权成功，访问令牌已自动保存')
-              }
-            }
-          }, 1000)
-          
-          this.$message.info('请在授权页面完成授权，授权成功后会自动保存访问令牌')
+          this.tokenValid = res.data.hasToken === true
         } else {
-          this.$message.error(res.msg || '获取授权URL失败')
+          this.tokenValid = false
         }
       } catch (e) {
-        this.$message.error('授权失败，请稍后重试')
-        console.error('授权失败', e)
+        console.error('检查token状态失败', e)
+        this.tokenValid = false
+      } finally {
+        this.tokenStatusChecked = true
       }
     },
     
     /** 同步物流链接 */
     async handleSyncLogisticsSubmit() {
-      if (!this.syncLogisticsForm.accessToken) {
-        this.$message.warning('请先完成腾讯文档授权')
+      if (!this.tokenValid) {
+        this.$message.warning('访问令牌无效，请先完成授权并保存token')
         return
       }
       
@@ -740,13 +699,20 @@ export default {
         return
       }
       
-      // 保存配置到localStorage
-      localStorage.setItem('tendoc_sync_config', JSON.stringify(this.syncLogisticsForm))
+      // 保存配置到localStorage（不包含accessToken）
+      const configToSave = {
+        fileId: this.syncLogisticsForm.fileId,
+        sheetId: this.syncLogisticsForm.sheetId,
+        headerRow: this.syncLogisticsForm.headerRow,
+        orderNoColumn: this.syncLogisticsForm.orderNoColumn,
+        logisticsLinkColumn: this.syncLogisticsForm.logisticsLinkColumn
+      }
+      localStorage.setItem('tendoc_sync_config', JSON.stringify(configToSave))
       
       this.syncLogisticsLoading = true
       try {
         const params = {
-          accessToken: this.syncLogisticsForm.accessToken,
+          // 不再传递accessToken，后端自动获取
           fileId: this.syncLogisticsForm.fileId,
           sheetId: this.syncLogisticsForm.sheetId,
           headerRow: this.syncLogisticsForm.headerRow || 1