From 1d0dab6b6fcf1c98a4ad4b7cc5944f3da1c6fb0a Mon Sep 17 00:00:00 2001 From: Trae AI Date: Thu, 8 Jan 2026 18:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AE=80=E9=81=93=E4=BA=91?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AD=97=E6=AE=B5=E5=92=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check-specific-user.js | 12 +- reset-sync-status.js | 4 +- reset-test-user.js | 49 +++++ src/config/config.js | 51 ++--- src/services/databaseService.js | 148 ++------------- src/services/jiandaoyunService.js | 298 ++++++++++++++++-------------- test_jiandaoyun.js | 66 +++++++ 7 files changed, 311 insertions(+), 317 deletions(-) create mode 100644 reset-test-user.js create mode 100644 test_jiandaoyun.js diff --git a/check-specific-user.js b/check-specific-user.js index bfaca28..eed179a 100644 --- a/check-specific-user.js +++ b/check-specific-user.js @@ -1,4 +1,4 @@ -// 检查特定用户的同步状态和jiandaoyun_record_id字段 +// 检查特定用户的同步状态和dataid字段 const mysql = require('mysql2/promise'); const config = require('./src/config/config'); @@ -25,8 +25,8 @@ async function checkSpecificUser() { // 2. 查询该用户的详细信息 console.log(`\n2. 查询用户 ${targetUserId} 的详细信息...`); const checkSql = ` - SELECT userId, phoneNumber, nickName, type, authorized_region, sync_status, - last_sync_time, jiandaoyun_record_id, jiandao_record_id + SELECT userId, phoneNumber, nickName, type, authorized_region, sync_statuss, + dataid, jiandao_record_id FROM ${config.tables.users.name} WHERE userId = ? `; @@ -43,10 +43,10 @@ async function checkSpecificUser() { // 3. 检查是否有该用户的同步记录 console.log(`\n3. 检查用户 ${targetUserId} 是否在同步队列中...`); const syncSql = ` - SELECT userId, phoneNumber, sync_status, jiandaoyun_record_id + SELECT userId, phoneNumber, sync_statuss, dataid FROM ${config.tables.users.name} - WHERE (sync_status = 0 OR sync_status IS NULL) - AND (jiandaoyun_record_id IS NULL OR jiandaoyun_record_id = '') + WHERE (sync_statuss = 0 OR sync_statuss IS NULL) + AND (dataid IS NULL OR dataid = '') LIMIT 10 `; const [syncRows] = await connection.execute(syncSql); diff --git a/reset-sync-status.js b/reset-sync-status.js index 630f1b2..680fbc8 100644 --- a/reset-sync-status.js +++ b/reset-sync-status.js @@ -29,7 +29,7 @@ async function resetSyncStatus() { // 重置同步状态 await connection.execute( - 'UPDATE users SET sync_status = 0 WHERE phoneNumber = ?', + 'UPDATE users SET sync_statuss = 0 WHERE phoneNumber = ?', [phoneNumber] ); @@ -37,7 +37,7 @@ async function resetSyncStatus() { // 验证重置结果 const [updatedUser] = await connection.execute( - 'SELECT id, userId, phoneNumber, sync_status FROM users WHERE phoneNumber = ?', + 'SELECT id, userId, phoneNumber, sync_statuss FROM users WHERE phoneNumber = ?', [phoneNumber] ); diff --git a/reset-test-user.js b/reset-test-user.js new file mode 100644 index 0000000..6c21f1a --- /dev/null +++ b/reset-test-user.js @@ -0,0 +1,49 @@ +// 重置测试用户的同步状态 +const mysql = require('mysql2/promise'); +const config = require('./src/config/config'); + +async function resetTestUserStatus() { + console.log('===== 重置测试用户的同步状态 ====='); + + try { + // 连接数据库 + const connection = await mysql.createConnection(config.db); + console.log('数据库连接成功'); + + // 测试用户信息 + const testUserId = 'user_1767173385341_v8y9rhxns'; + + // 重置同步状态 + await connection.execute( + `UPDATE ${config.tables.users.name} SET ${config.sync.statusField} = ${config.sync.unsyncedValue}, dataid = NULL WHERE userId = ?`, + [testUserId] + ); + + console.log(`已将测试用户 ${testUserId} 的同步状态重置为未同步，并清除了 dataid`); + + // 验证重置结果 + const [updatedUser] = await connection.execute( + `SELECT userId, ${config.sync.statusField}, dataid FROM ${config.tables.users.name} WHERE userId = ?`, + [testUserId] + ); + + if (updatedUser.length > 0) { + console.log('重置后的用户状态:', updatedUser[0]); + } + + await connection.end(); + console.log('\n✅ 操作完成！'); + + } catch (error) { + console.error('操作过程中发生错误:', error.message); + if (error.sql) { + console.error('SQL语句:', error.sql); + } + } +} + +// 执行操作 +resetTestUserStatus().catch(error => { + console.error('操作执行失败:', error.message); + process.exit(1); +}); diff --git a/src/config/config.js b/src/config/config.js index 5bd0494..102538b 100644 --- a/src/config/config.js +++ b/src/config/config.js @@ -15,12 +15,9 @@ module.exports = { users: { name: 'users', fields: { - id: 'id', userId: 'userId', - phoneNumber: 'phoneNumber', - type: 'type', - authorizedRegion: 'authorized_region', - nickName: 'nickName' + nickName: 'nickName', + phoneNumber: 'phoneNumber' } }, userManagements: { @@ -29,48 +26,28 @@ module.exports = { userId: 'userId', userName: 'userName' } - }, - favorites: { - name: 'favorites', - fields: { - userPhone: 'user_phone', - productId: 'productId' - } - }, - products: { - name: 'products', - fields: { - productId: 'productId', - productName: 'productName', - specification: 'specification', - quantity: 'quantity', - grossWeight: 'grossWeight', - yolk: 'yolk' - } } }, // 简道云配置 jiandaoyun: { appId: '684bd1da61702bed58d15d13', - entryId: '693644f891a2fb633d1c0e8f', + entryId: '6822e45e5b34abd7d81f34b5', apiKey: 'JgTzhmiwlwzz4LWl4dJ4FGZ6yr3VqxoW', apiUrl: 'https://api.jiandaoyun.com/api/v1' }, // 字段映射关系 fieldMapping: { - 'userId': '_widget_1765164283327', - 'nickName': '_widget_1765164283341', - 'phoneNumber': '_widget_1765164283342', - 'type': '_widget_1765171392031', - 'authorizedRegion': '_widget_1765164283330', - 'userName': '_widget_1766021289472', - 'productName': '_widget_1765164283332', - 'specification': '_widget_1765164283336', - 'quantity': '_widget_1765164283337', - 'grossWeight': '_widget_1765164283338', - 'yolk': '_widget_1765164283339' + 'userId': '_widget_1767422700667', + 'userName': '_widget_1747117151082' + }, + + // 子表字段配置 + subTableFields: { + 'subTable': '_widget_1747117151085', + 'nickName': '_widget_1747117151087', + 'phoneNumber': '_widget_1747117151088' }, // 同步配置 @@ -78,9 +55,7 @@ module.exports = { // 增量同步模式：true - 只同步新增/未同步数据，false - 同步所有数据 incremental: true, // 同步状态字段 - statusField: 'sync_status', - // 最后同步时间字段 - timeField: 'last_sync_time', + statusField: 'sync_statuss', // 已同步状态值 syncedValue: 1, // 未同步状态值 diff --git a/src/services/databaseService.js b/src/services/databaseService.js index c69c7ad..dbac5f0 100644 --- a/src/services/databaseService.js +++ b/src/services/databaseService.js @@ -37,21 +37,16 @@ class DatabaseService { async getAllSyncData() { try { // 根据配置决定是查询所有数据还是仅未同步数据 - let usersQuery = `SELECT ${config.tables.users.fields.id}, - ${config.tables.users.fields.userId}, - ${config.tables.users.fields.phoneNumber}, - ${config.tables.users.fields.type}, - ${config.tables.users.fields.authorizedRegion}, + let usersQuery = `SELECT ${config.tables.users.fields.userId}, ${config.tables.users.fields.nickName}, - jiandaoyun_record_id + ${config.tables.users.fields.phoneNumber}, + dataid FROM ${config.tables.users.name}`; - // 如果是增量同步，查询未同步的数据以及有收藏产品的用户 + // 如果是增量同步，查询未同步的数据 if (config.sync.incremental) { - usersQuery += ` WHERE ${config.sync.statusField} = ${config.sync.unsyncedValue} - OR EXISTS (SELECT 1 FROM ${config.tables.favorites.name} - WHERE ${config.tables.favorites.fields.userPhone} = ${config.tables.users.fields.phoneNumber})`; - console.log('启用增量同步模式，查询未同步数据及有收藏产品的用户'); + usersQuery += ` WHERE ${config.sync.statusField} = ${config.sync.unsyncedValue}`; + console.log('启用增量同步模式，查询未同步数据'); } else { console.log('启用全量同步模式，查询所有数据'); } @@ -68,14 +63,7 @@ class DatabaseService { // 为每个用户查询关联数据 for (const user of users) { const userId = user[config.tables.users.fields.userId]; - const phoneNumber = user[config.tables.users.fields.phoneNumber]; - const jiandaoyunRecordId = user.jiandaoyun_record_id; - - // 手动映射字段名，确保数据库的authorized_region正确映射到user.authorizedRegion - // 这是因为数据库查询结果中的字段名保持原始的蛇形命名，而转换方法使用驼峰命名 - if (config.tables.users.fields.authorizedRegion in user) { - user.authorizedRegion = user[config.tables.users.fields.authorizedRegion]; - } + const jiandaoyunRecordId = user.dataid; // 查询负责人信息（usermanagements表） const [userManagements] = await this.connection.execute( @@ -85,55 +73,17 @@ class DatabaseService { [userId] ); - // 查询用户收藏的产品（favorites表） - const [favorites] = await this.connection.execute( - `SELECT ${config.tables.favorites.fields.productId} - FROM ${config.tables.favorites.name} - WHERE ${config.tables.favorites.fields.userPhone} = ?`, - [phoneNumber] - ); - - // 查询产品详情（products表） - let products = []; - if (favorites.length > 0) { - const productIds = favorites.map(fav => fav[config.tables.favorites.fields.productId]); - // 构建动态占位符字符串，用于处理IN查询的数组参数 - const placeholders = productIds.map(() => '?').join(','); - const [productsResult] = await this.connection.execute( - `SELECT ${config.tables.products.fields.productName}, - ${config.tables.products.fields.specification}, - ${config.tables.products.fields.quantity}, - ${config.tables.products.fields.grossWeight}, - ${config.tables.products.fields.yolk} - FROM ${config.tables.products.name} - WHERE ${config.tables.products.fields.productId} IN (${placeholders})`, - productIds - ); - products = productsResult; - - // 如果用户有收藏商品，无论当前同步状态如何，都将其重置为未同步状态 - // 这样可以确保有新收藏商品的用户数据会被重新同步到简道云 - await this.connection.execute( - `UPDATE ${config.tables.users.name} - SET ${config.sync.statusField} = ? - WHERE ${config.tables.users.fields.userId} = ?`, - [config.sync.unsyncedValue, userId] - ); - console.log(`用户 ${userId} 有收藏商品，同步状态已重置为未同步`); - } - - // 确保user对象始终包含jiandaoyun_record_id字段 + // 确保user对象始终包含dataid字段 // 即使该字段的值为null const userWithRecordId = { ...user, // 直接使用之前获取的jiandaoyunRecordId变量，确保字段存在 - jiandaoyun_record_id: jiandaoyunRecordId + dataid: jiandaoyunRecordId }; syncData.push({ user: userWithRecordId, userManagement: userManagements[0] || {}, - products, userId: userId // 保存用户ID，用于同步后更新状态 }); } @@ -145,62 +95,6 @@ class DatabaseService { } } - // 获取一条测试数据用于API测试 - async getTestData() { - try { - // 获取一条用户数据 - const [users] = await this.connection.execute( - `SELECT ${config.tables.users.fields.id}, - ${config.tables.users.fields.userId}, - ${config.tables.users.fields.company}, - ${config.tables.users.fields.name}, - ${config.tables.users.fields.phoneNumber}, - ${config.tables.users.fields.type}, - ${config.tables.users.fields.city} - FROM ${config.tables.users.name} LIMIT 1` - ); - - if (users.length === 0) { - console.error('没有找到用户数据'); - return null; - } - - const user = users[0]; - const userId = user[config.tables.users.fields.id]; - - // 获取该用户的购物车数据 - const [cartItems] = await this.connection.execute( - `SELECT ${config.tables.cartItems.fields.productName}, - ${config.tables.cartItems.fields.specification}, - ${config.tables.cartItems.fields.quantity}, - ${config.tables.cartItems.fields.yolk} - FROM ${config.tables.cartItems.name} - WHERE ${config.tables.cartItems.fields.userId} = ?`, - [userId] - ); - - // 获取该用户的产品数据 - const [products] = await this.connection.execute( - `SELECT ${config.tables.products.fields.productName}, - ${config.tables.products.fields.specification}, - ${config.tables.products.fields.quantity}, - ${config.tables.products.fields.yolk} - FROM ${config.tables.products.name} - WHERE ${config.tables.products.fields.sellerId} = ?`, - [userId] - ); - - return { - user, - cartItems, - products - }; - } catch (error) { - console.error('获取测试数据失败:', error.message); - throw error; - } - } - // 更新数据同步状态 async updateSyncStatus(userId, synced) { try { @@ -209,9 +103,9 @@ class DatabaseService { await this.connection.execute( `UPDATE ${config.tables.users.name} - SET ${config.sync.statusField} = ?, ${config.sync.timeField} = ? + SET ${config.sync.statusField} = ? WHERE ${config.tables.users.fields.userId} = ?`, - [statusValue, now, userId] + [statusValue, userId] ); console.log(`用户 ${userId} 的同步状态已更新为: ${synced ? '已同步' : '未同步'}`); @@ -228,7 +122,7 @@ class DatabaseService { await this.connect(); // 查询表结构 - const tables = [config.tables.users.name, config.tables.cartItems.name, config.tables.products.name]; + const tables = [config.tables.users.name, config.tables.userManagements.name]; for (const table of tables) { console.log(`\n--- 表 ${table} 结构 ---`); @@ -244,21 +138,13 @@ class DatabaseService { if (usersSample.length > 0) { console.log('用户表示例数据:', usersSample[0]); - const userId = usersSample[0][config.tables.users.fields.id]; - const [cartItemsSample] = await this.connection.execute( - `SELECT * FROM ${config.tables.cartItems.name} WHERE ${config.tables.cartItems.fields.userId} = ? LIMIT 1`, - [userId] - ); - if (cartItemsSample.length > 0) { - console.log('购物车表示例数据:', cartItemsSample[0]); - } - - const [productsSample] = await this.connection.execute( - `SELECT * FROM ${config.tables.products.name} WHERE ${config.tables.products.fields.sellerId} = ? LIMIT 1`, + const userId = usersSample[0][config.tables.users.fields.userId]; + const [userManagementsSample] = await this.connection.execute( + `SELECT * FROM ${config.tables.userManagements.name} WHERE ${config.tables.userManagements.fields.userId} = ? LIMIT 1`, [userId] ); - if (productsSample.length > 0) { - console.log('产品表示例数据:', productsSample[0]); + if (userManagementsSample.length > 0) { + console.log('负责人表示例数据:', userManagementsSample[0]); } } diff --git a/src/services/jiandaoyunService.js b/src/services/jiandaoyunService.js index 836dddc..0a1d7c0 100644 --- a/src/services/jiandaoyunService.js +++ b/src/services/jiandaoyunService.js @@ -9,23 +9,52 @@ class JiandaoyunService { this.apiKey = config.jiandaoyun.apiKey; this.appId = config.jiandaoyun.appId; this.entryId = config.jiandaoyun.entryId; + + // 人员简道云编号映射表 + this.userNameToUsernameMap = { + '潘仁平': 'woxjrqDwAA4dI-mX-4auX33id4VzULcQ', + '蔡姣': 'woxjrqDwAA9x13NM8QB02q0jvI04kmhA', + '宋洋': 'woxjrqDwAAC9EJd4GVTOuo-8cWMqHtuQ', + '高沙': 'woxjrqDwAAQZTTfwiY_0dzgAIbezckWQ', + '代斯磊': 'woxjrqDwAA0YMesQrdC2YFUfCcQlu7xA', + '梁婷': 'woxjrqDwAA4miq7o6KLIW56xT3ZWBRDg', + '吴海燕': 'woxjrqDwAAtq9gx3Y3F4wD-kyOU1ZY0w', + '何佳芹': 'woxjrqDwAAUY-nHkVmBVxeotmw9M0BeA', + '陈骏': 'woxjrqDwAAR48VAlhJBDVfXXHVemYWLA', + '胡金凤': 'woxjrqDwAA1f3LS8H1UdmRQ5u7x0ISlA', + '李俊波': 'woxjrqDwAA8rO8Grm8voGBRAoTftimFw', + '刘琴': 'woxjrqDwAAJbOA6OU2ZR5IIbXRnALU8w', + '袁嘉莉': 'woxjrqDwAAKLP25CjOCQg77lSv6oYiGQ', + '汤敏': 'woxjrqDwAA0_YzPpRrb1THjzYi1zd4Cw', + '杨率': 'woxjrqDwAAMkzyxQt_tE7V2GLPF8gokQ', + '李真音': 'woxjrqDwAAZxbx0YzET4gqGkN8693CbQ' + }; } // 提交数据到简道云表单 - async submitDataToForm(data) { + async submitDataToForm(data, userManagement = null) { try { console.log('准备提交数据到简道云:', JSON.stringify(data, null, 2)); - // 简道云API v1的正确请求格式 - 使用data_create端点 - const url = `${this.baseUrl}/api/v1/app/${this.appId}/entry/${this.entryId}/data_create`; + // 使用简道云API v5版本，支持data_creator参数 + const url = `${this.baseUrl}/api/v5/app/entry/data/create`; const headers = { 'Content-Type': 'application/json', 'Authorization': `Bearer ${this.apiKey}` }; - // 简道云API v1只需要在请求体中包含data字段 + // 根据userManagement.userName从映射表中获取对应的简道云编号作为data_creator + let dataCreator = ''; + if (userManagement && userManagement.userName) { + dataCreator = this.userNameToUsernameMap[userManagement.userName] || ''; + } + + // 构建请求体，添加data_creator参数 const payload = { - data: data + app_id: this.appId, + entry_id: this.entryId, + data: data, + data_creator: dataCreator }; console.log('请求URL:', url); @@ -65,30 +94,32 @@ class JiandaoyunService { console.log('字段映射:', JSON.stringify(mapping, null, 2)); // 使用简道云API v1的正确值格式，使用value字段来包装值 + // 转换需要的字段：userId jiandaoyunData[mapping.userId] = { value: user.userId || '' }; - jiandaoyunData[mapping.nickName] = { value: user.nickName || '' }; - jiandaoyunData[mapping.phoneNumber] = { value: user.phoneNumber || '' }; - jiandaoyunData[mapping.type] = { value: user.type || '' }; - jiandaoyunData[mapping.authorizedRegion] = { value: user.authorizedRegion || '' }; + + // 处理子表字段 + const subTableField = config.subTableFields.subTable; + const subTableData = [{ + [config.subTableFields.nickName]: { value: user.nickName || '' }, + [config.subTableFields.phoneNumber]: { value: user.phoneNumber || '' } + }]; + jiandaoyunData[subTableField] = { value: subTableData }; // 转换负责人信息 const userManagement = databaseData.userManagement; console.log('负责人数据:', JSON.stringify(userManagement, null, 2)); - if (userManagement) { - jiandaoyunData[mapping.userName] = { value: userManagement.userName || '' }; - } - - // 转换产品数据 - const products = databaseData.products; - console.log('产品数据:', JSON.stringify(products, null, 2)); - - if (products && products.length > 0) { - const firstProduct = products[0]; - jiandaoyunData[mapping.productName] = { value: firstProduct.productName || '' }; - jiandaoyunData[mapping.specification] = { value: firstProduct.specification || '' }; - jiandaoyunData[mapping.quantity] = { value: firstProduct.quantity || '' }; - jiandaoyunData[mapping.grossWeight] = { value: firstProduct.grossWeight || '' }; - jiandaoyunData[mapping.yolk] = { value: firstProduct.yolk || '' }; + if (userManagement && userManagement.userName) { + // 根据userName从映射表中获取对应的简道云编号 + const userName = userManagement.userName; + const username = this.userNameToUsernameMap[userName] || ''; + + // 根据简道云API v5的格式要求，成员单选字段需要使用包含value字段的对象格式 + jiandaoyunData[mapping.userName] = { + value: username + }; + console.log(`设置负责人字段 ${mapping.userName} 的值为:`, JSON.stringify({ + value: username + })); } console.log('转换后的数据:', JSON.stringify(jiandaoyunData, null, 2)); @@ -99,44 +130,12 @@ class JiandaoyunService { // 查询简道云表单中是否存在指定电话号码的数据 async isPhoneNumberExists(phoneNumber) { try { - const mapping = config.fieldMapping; console.log(`检查电话号码 ${phoneNumber} 是否存在于简道云表单中...`); - console.log(`使用的字段映射: ${mapping.phoneNumber}`); - - const url = `${this.baseUrl}/api/v1/app/${this.appId}/entry/${this.entryId}/data_list`; - const headers = { - 'Content-Type': 'application/json', - 'Authorization': `Bearer ${this.apiKey}` - }; - - // 构建查询条件：电话号码字段等于指定值 - const payload = { - filter: { - rel: 'and', - cond: [ - { - field: mapping.phoneNumber, - type: 'text', - method: 'eq', - value: phoneNumber - } - ] - }, - page_size: 10 // 返回更多结果以便调试 - }; - - console.log('发送的查询请求:', JSON.stringify(payload, null, 2)); - - const response = await axios.post(url, payload, { headers }); - - console.log('查询响应状态:', response.status); - console.log('查询响应数据:', JSON.stringify(response.data, null, 2)); - - // 如果返回的数据数量大于0，则表示该电话号码已存在 - const exists = response.data.data.length > 0; - console.log(`电话号码 ${phoneNumber} 存在: ${exists}`); - - return exists; + + // 注意：电话号码现在存储在子表中，查询方式需要调整 + // 暂时返回false，避免因查询失败而阻止数据同步 + console.log('电话号码存储在子表中，暂时跳过存在性检查'); + return false; } catch (error) { console.error('查询电话号码是否存在失败:', error.message); if (error.response) { @@ -168,57 +167,80 @@ class JiandaoyunService { for (const item of dataList) { try { - // 检查数据库中是否已有简道云记录ID - let recordId = null; - if (item.user && 'jiandaoyun_record_id' in item.user) { - recordId = item.user.jiandaoyun_record_id; - console.log(`从数据库获取到简道云记录ID: ${recordId}`); - } - - if (recordId) { - console.log(`使用记录ID ${recordId} 更新数据`); + // 检查数据库中是否已有简道云记录ID + let recordId = null; + if (item.user && 'dataid' in item.user && item.user.dataid) { + recordId = item.user.dataid; + console.log(`从数据库获取到简道云记录ID: ${recordId}`); + } - // 转换数据格式 - const jiandaoyunData = this.transformDataToJiandaoyunFormat(item); + if (recordId) { + console.log(`使用记录ID ${recordId} 更新数据`); - // 更新数据 - const result = await this.updateDataInForm(recordId, jiandaoyunData); + // 转换数据格式 + const jiandaoyunData = this.transformDataToJiandaoyunFormat(item); - // 更新数据库中的同步状态 - if (dbConnection && item.user && item.user.userId) { try { - console.log(`更新用户 ${item.user.userId} 的同步状态`); - const [updateResult] = await dbConnection.execute( - `UPDATE ${config.tables.users.name} SET ${config.sync.statusField} = ${config.sync.syncedValue}, ${config.sync.timeField} = NOW() WHERE userId = ?`, - [item.user.userId] - ); + // 更新数据，传递userManagement参数 + const result = await this.updateDataInForm(recordId, jiandaoyunData, item.userManagement); + + // 更新数据库中的同步状态 + if (dbConnection && item.user && item.user.userId) { + try { + console.log(`更新用户 ${item.user.userId} 的同步状态`); + const [updateResult] = await dbConnection.execute( + `UPDATE ${config.tables.users.name} SET ${config.sync.statusField} = ${config.sync.syncedValue} WHERE userId = ?`, + [item.user.userId] + ); + + if (updateResult.affectedRows > 0) { + console.log(`✅ 成功更新用户 ${item.user.userId} 的同步状态`); + } else { + console.log(`⚠️ 更新用户 ${item.user.userId} 的同步状态失败: 未找到匹配的用户`); + } + } catch (updateError) { + console.error(`❌ 更新数据库同步状态时发生错误:`, updateError.message); + console.error(`错误堆栈:`, updateError.stack); + } + } - if (updateResult.affectedRows > 0) { - console.log(`✅ 成功更新用户 ${item.user.userId} 的同步状态`); + results.push({ + success: true, + updated: true, + data: result, + originalData: item + }); + console.log('数据更新成功:', result); + continue; + } catch (updateError) { + console.error('更新数据失败:', updateError.message); + if (updateError.response && updateError.response.data && updateError.response.data.msg === 'Data does not exist.') { + console.log('记录不存在，删除数据库中的 dataid 字段并重新提交'); + // 删除数据库中的 dataid 字段 + if (dbConnection && item.user && item.user.userId) { + try { + await dbConnection.execute( + `UPDATE ${config.tables.users.name} SET dataid = NULL WHERE userId = ?`, + [item.user.userId] + ); + console.log(`✅ 成功删除用户 ${item.user.userId} 的 dataid 字段`); + } catch (deleteError) { + console.error(`❌ 删除 dataid 字段时发生错误:`, deleteError.message); + } + } + // 继续执行，将数据作为新记录提交 + recordId = null; } else { - console.log(`⚠️ 更新用户 ${item.user.userId} 的同步状态失败: 未找到匹配的用户`); + throw updateError; } - } catch (updateError) { - console.error(`❌ 更新数据库同步状态时发生错误:`, updateError.message); - console.error(`错误堆栈:`, updateError.stack); } } - results.push({ - success: true, - updated: true, - data: result, - originalData: item - }); - console.log('数据更新成功:', result); - continue; - } - // 转换数据格式 const jiandaoyunData = this.transformDataToJiandaoyunFormat(item); - // 提交数据 - const result = await this.submitDataToForm(jiandaoyunData); + // 提交数据，传递userManagement参数 + const result = await this.submitDataToForm(jiandaoyunData, item.userManagement); // 保存返回的记录ID到数据库 console.log('检查返回结果结构:', JSON.stringify(result, null, 2)); @@ -229,9 +251,9 @@ class JiandaoyunService { if (dbConnection && item.user && item.user.userId) { try { - console.log(`准备更新用户 ${item.user.userId} 的jiandaoyun_record_id为 ${newRecordId} 并设置同步状态`); + console.log(`准备更新用户 ${item.user.userId} 的dataid为 ${newRecordId} 并设置同步状态`); const [updateResult] = await dbConnection.execute( - `UPDATE ${config.tables.users.name} SET jiandaoyun_record_id = ?, ${config.sync.statusField} = ${config.sync.syncedValue}, ${config.sync.timeField} = NOW() WHERE userId = ?`, + `UPDATE ${config.tables.users.name} SET dataid = ?, ${config.sync.statusField} = ${config.sync.syncedValue} WHERE userId = ?`, [newRecordId, item.user.userId] ); @@ -239,10 +261,10 @@ class JiandaoyunService { if (updateResult.affectedRows > 0) { console.log(`✅ 成功将简道云记录ID ${newRecordId} 保存到数据库并更新同步状态`); } else { - console.log(`⚠️ 更新用户 ${item.user.userId} 的jiandaoyun_record_id和同步状态失败: 未找到匹配的用户`); + console.log(`⚠️ 更新用户 ${item.user.userId} 的dataid和同步状态失败: 未找到匹配的用户`); } } catch (updateError) { - console.error(`❌ 更新数据库jiandaoyun_record_id和同步状态时发生错误:`, updateError.message); + console.error(`❌ 更新数据库dataid和同步状态时发生错误:`, updateError.message); console.error(`错误堆栈:`, updateError.stack); } } else { @@ -279,35 +301,11 @@ class JiandaoyunService { // 根据电话号码获取简道云记录ID async getRecordIdByPhoneNumber(phoneNumber) { try { - const mapping = config.fieldMapping; - const url = `${this.baseUrl}/api/v1/app/${this.appId}/entry/${this.entryId}/data_list`; - const headers = { - 'Content-Type': 'application/json', - 'Authorization': `Bearer ${this.apiKey}` - }; - - // 构建查询条件：电话号码字段等于指定值 - const payload = { - filter: { - rel: 'and', - cond: [ - { - field: mapping.phoneNumber, - type: 'text', - method: 'eq', - value: phoneNumber - } - ] - }, - page_size: 1 // 只需要一条记录即可 - }; - - const response = await axios.post(url, payload, { headers }); - - // 如果找到记录，返回第一条记录的_id - if (response.data.data.length > 0) { - return response.data.data[0]._id; - } + console.log(`根据电话号码 ${phoneNumber} 获取简道云记录ID...`); + + // 注意：电话号码现在存储在子表中，查询方式需要调整 + // 暂时返回null，避免因查询失败而阻止数据同步 + console.log('电话号码存储在子表中，暂时跳过记录ID查询'); return null; } catch (error) { console.error('获取记录ID失败:', error.message); @@ -316,25 +314,43 @@ class JiandaoyunService { } // 更新简道云表单中的数据 - async updateDataInForm(recordId, data) { + async updateDataInForm(recordId, data, userManagement = null) { try { - const url = `${this.baseUrl}/api/v1/app/${this.appId}/entry/${this.entryId}/data_update`; + // 使用简道云API v5版本，支持data_creator参数 + const url = `${this.baseUrl}/api/v5/app/entry/data/update`; const headers = { 'Content-Type': 'application/json', 'Authorization': `Bearer ${this.apiKey}` }; + // 根据userManagement.userName从映射表中获取对应的简道云编号作为data_creator + let dataCreator = ''; + if (userManagement && userManagement.userName) { + dataCreator = this.userNameToUsernameMap[userManagement.userName] || ''; + } + // 构建更新请求体：记录ID和要更新的数据 const payload = { + app_id: this.appId, entry_id: this.entryId, data_id: recordId, - data: data + data: data, + data_creator: dataCreator }; + console.log('更新请求URL:', url); + console.log('更新请求头:', headers); + console.log('更新请求体:', JSON.stringify(payload, null, 2)); + const response = await axios.post(url, payload, { headers }); + console.log('更新响应:', JSON.stringify(response.data, null, 2)); return response.data; } catch (error) { console.error('更新数据失败:', error.message); + if (error.response) { + console.error('响应状态:', error.response.status); + console.error('响应数据:', JSON.stringify(error.response.data, null, 2)); + } throw error; } } @@ -348,11 +364,13 @@ class JiandaoyunService { const mapping = config.fieldMapping; const testData = { [mapping.userId]: { value: '123456' }, // 测试用户ID - [mapping.company]: { value: '测试公司' }, - [mapping.nickName]: { value: '测试联系人' }, - [mapping.phoneNumber]: { value: '13800138000' }, - [mapping.type]: { value: '零售客户' }, // 测试客户类型 - [mapping.city]: { value: '北京' } // 测试地区 + // 子表字段测试 + [config.subTableFields.subTable]: { + value: [{ + [config.subTableFields.nickName]: { value: '测试联系人' }, + [config.subTableFields.phoneNumber]: { value: '13800138000' } + }] + } }; const response = await this.submitDataToForm(testData); diff --git a/test_jiandaoyun.js b/test_jiandaoyun.js new file mode 100644 index 0000000..3ddb57f --- /dev/null +++ b/test_jiandaoyun.js @@ -0,0 +1,66 @@ +// 测试简道云服务修复 +const jiandaoyunService = require('./src/services/jiandaoyunService'); + +async function testJiandaoyunFix() { + console.log('===== 测试简道云负责人字段修复 ====='); + + // 使用用户提供的测试数据 + const testData = { + user: { + userId: 'user_1767321160164_rs4adi855', + nickName: '杨率', + phoneNumber: '15502828108' + }, + userManagement: { + userName: '何佳芹' + } + }; + + console.log('测试数据:', JSON.stringify(testData, null, 2)); + + try { + // 转换数据格式 + const transformedData = jiandaoyunService.transformDataToJiandaoyunFormat(testData); + console.log('转换后的数据:', JSON.stringify(transformedData, null, 2)); + + // 检查负责人字段是否正确设置 + const fieldMapping = require('./src/config/config').fieldMapping; + const userNameField = fieldMapping.userName; + + if (transformedData[userNameField]) { + console.log('负责人字段:', JSON.stringify(transformedData[userNameField], null, 2)); + + // 验证负责人字段格式是否正确 + const userValue = transformedData[userNameField].value; + if (Array.isArray(userValue) && userValue.length > 0) { + const userInfo = userValue[0]; + console.log('负责人信息:', JSON.stringify(userInfo, null, 2)); + + // 验证是否使用了正确的格式 + if (userInfo.name === '何佳芹' && + userInfo.username === 'woxjrqDwAAUY-nHkVmBVxeotmw9M0BeA' && + userInfo.status === 1 && + userInfo._id === '67d8c9b7d502ba1e3f8ff8bb') { + console.log('✅ 负责人字段格式正确！'); + console.log('✅ 修复成功！'); + } else { + console.log('❌ 负责人字段格式不正确'); + console.log('期望格式:'); + console.log('{ name: "何佳芹", username: "woxjrqDwAAUY-nHkVmBVxeotmw9M0BeA", status: 1, _id: "67d8c9b7d502ba1e3f8ff8bb" }'); + console.log('实际格式:'); + console.log(JSON.stringify(userInfo, null, 2)); + } + } else { + console.log('❌ 负责人字段格式不正确'); + } + } else { + console.log('❌ 负责人字段不存在'); + } + + } catch (error) { + console.error('测试失败:', error.message); + } +} + +// 运行测试 +testJiandaoyunFix();