diff --git a/src/adapter/shopyy.adapter.ts b/src/adapter/shopyy.adapter.ts index 48d1014..d50e5b2 100644 --- a/src/adapter/shopyy.adapter.ts +++ b/src/adapter/shopyy.adapter.ts @@ -391,7 +391,6 @@ export class ShopyyAdapter implements ISiteAdapter { tracking_number: f.tracking_number || '', shipping_provider: f.tracking_company || '', shipping_method: f.tracking_company || '', - date_created: typeof f.created_at === 'number' ? new Date(f.created_at * 1000).toISOString() : f.created_at || '', diff --git a/src/config/config.local.ts b/src/config/config.local.ts index b02f922..67785b5 100644 --- a/src/config/config.local.ts +++ b/src/config/config.local.ts @@ -12,14 +12,15 @@ export default { // }, // }, // }, - typeorm: { + typeorm: { dataSource: { default: { - host: 'localhost', - port: "23306", + host: '13.212.62.127', + port: "3306", username: 'root', - password: '12345678', + password: 'Yoone!@.2025', database: 'inventory_v2', + synchronize: true, }, }, }, diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 586dc42..282c093 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -141,7 +141,7 @@ export class OrderService { updated: 0, errors: [] }; - + console.log('开始进入循环同步订单', result.length, '个订单') // 遍历每个订单进行同步 for (const order of result) { try { @@ -165,6 +165,7 @@ export class OrderService { } else { syncResult.created++; } + // console.log('updated', syncResult.updated, 'created:', syncResult.created) } catch (error) { // 记录错误但不中断整个同步过程 syncResult.errors.push({ @@ -174,6 +175,8 @@ export class OrderService { syncResult.processed++; } } + console.log('同步完成', syncResult.updated, 'created:', syncResult.created) + this.logger.debug('syncOrders result', syncResult) return syncResult; } @@ -350,14 +353,14 @@ export class OrderService { await this.saveOrderItems({ siteId, orderId, - externalOrderId, + externalOrderId: String(externalOrderId), orderItems: line_items, }); // 保存退款信息 await this.saveOrderRefunds({ siteId, orderId, - externalOrderId, + externalOrderId , refunds, }); // 保存费用信息 @@ -1229,13 +1232,13 @@ export class OrderService { parameters.push(siteId); } if (startDate) { - sqlQuery += ` AND o.date_created >= ?`; - totalQuery += ` AND o.date_created >= ?`; + sqlQuery += ` AND o.date_paid >= ?`; + totalQuery += ` AND o.date_paid >= ?`; parameters.push(startDate); } if (endDate) { - sqlQuery += ` AND o.date_created <= ?`; - totalQuery += ` AND o.date_created <= ?`; + sqlQuery += ` AND o.date_paid <= ?`; + totalQuery += ` AND o.date_paid <= ?`; parameters.push(endDate); } // 支付方式筛选(使用参数化,避免SQL注入) @@ -1323,7 +1326,7 @@ export class OrderService { // 添加分页到主查询 sqlQuery += ` GROUP BY o.id - ORDER BY o.date_created DESC + ORDER BY o.date_paid DESC LIMIT ? OFFSET ? `; parameters.push(pageSize, (current - 1) * pageSize); @@ -2541,7 +2544,7 @@ export class OrderService { '姓名地址': nameAddress, '邮箱': order.customer_email || '', '号码': phone, - '订单内容': orderContent, + '订单内容': this.removeLastParenthesesContent(orderContent), '盒数': boxCount, '换盒数': exchangeBoxCount, '换货内容': exchangeContent,