diff --git a/src/adapter/shopyy.adapter.ts b/src/adapter/shopyy.adapter.ts index d9215bb..2843547 100644 --- a/src/adapter/shopyy.adapter.ts +++ b/src/adapter/shopyy.adapter.ts @@ -367,7 +367,6 @@ export class ShopyyAdapter implements ISiteAdapter { date_paid: typeof item.pay_at === 'number' ? item.pay_at === 0 ? null : new Date(item.pay_at * 1000).toISOString() : null, - refunds: [], currency_symbol: (currencySymbols[item.currency] || '$') || '', date_created: @@ -387,6 +386,7 @@ 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/dto/shopyy.dto.ts b/src/dto/shopyy.dto.ts index e775bdd..b434fa8 100644 --- a/src/dto/shopyy.dto.ts +++ b/src/dto/shopyy.dto.ts @@ -346,6 +346,7 @@ export interface ShopyyOrder { financial_status?: number; fulfillment_status?: number; // 创建与更新时间可能为时间戳 + date_paid?: number | string; created_at?: number | string; date_added?: string; updated_at?: number | string; diff --git a/src/dto/site.dto.ts b/src/dto/site.dto.ts index 7c0267d..c8509d7 100644 --- a/src/dto/site.dto.ts +++ b/src/dto/site.dto.ts @@ -121,7 +121,7 @@ export class UpdateSiteDTO { skuPrefix?: string; // 区域 - @ApiProperty({ description: '区域' }) + @ApiProperty({ description: '区域', required: false }) @Rule(RuleType.array().items(RuleType.string()).optional()) areas?: string[]; @@ -133,6 +133,10 @@ export class UpdateSiteDTO { @ApiProperty({ description: '站点网站URL', required: false }) @Rule(RuleType.string().optional()) websiteUrl?: string; + + @ApiProperty({ description: 'Webhook URL', required: false }) + @Rule(RuleType.string().optional()) + webhookUrl?: string; } export class QuerySiteDTO { diff --git a/src/dto/statistics.dto.ts b/src/dto/statistics.dto.ts index 2bd6250..da6f46a 100644 --- a/src/dto/statistics.dto.ts +++ b/src/dto/statistics.dto.ts @@ -19,6 +19,10 @@ export class OrderStatisticsParams { @Rule(RuleType.number().allow(null)) siteId?: number; + @ApiProperty() + @Rule(RuleType.array().allow(null)) + country?: any[]; + @ApiProperty({ enum: ['all', 'first_purchase', 'repeat_purchase'], default: 'all', diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 3dfd68b..e153323 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -301,7 +301,7 @@ export class OrderService { * @param order 订单数据 * @param forceUpdate 是否强制更新 */ - async syncSingleOrder(siteId: number, order: any, forceUpdate = false) { + async syncSingleOrder(siteId: number, order: UnifiedOrderDTO, forceUpdate = false) { // 从订单数据中解构出各个子项 let { line_items, @@ -319,7 +319,7 @@ export class OrderService { } // 检查数据库中是否已存在该订单 const existingOrder = await this.orderModel.findOne({ - where: { externalOrderId: order.id, siteId: siteId }, + where: { externalOrderId: String(order.id), siteId: siteId }, }); // 自动更新订单状态(如果需要) await this.autoUpdateOrderStatus(siteId, order); @@ -328,10 +328,10 @@ export class OrderService { // 矫正数据库中的订单数据 const updateData: any = { status: order.status }; if (this.canUpdateErpStatus(existingOrder.orderStatus)) { - updateData.orderStatus = this.mapOrderStatus(order.status); + updateData.orderStatus = this.mapOrderStatus(order.status as any); } - // 更新 - await this.orderModel.update({ externalOrderId: order.id, siteId: siteId }, updateData); + // 更新订单主数据 + await this.orderModel.update({ externalOrderId: String(order.id), siteId: siteId }, updateData); // 更新 fulfillments 数据 await this.saveOrderFulfillments({ siteId, @@ -340,7 +340,7 @@ export class OrderService { fulfillments: fulfillments, }); } - const externalOrderId = order.id; + const externalOrderId = String(order.id); // 如果订单从未完成变为完成状态,则更新库存 if ( existingOrder && @@ -361,14 +361,14 @@ export class OrderService { await this.saveOrderItems({ siteId, orderId, - externalOrderId, + externalOrderId: String(externalOrderId), orderItems: line_items, }); // 保存退款信息 await this.saveOrderRefunds({ siteId, orderId, - externalOrderId, + externalOrderId , refunds, }); // 保存费用信息 @@ -459,7 +459,7 @@ export class OrderService { * @param order 订单数据 * @returns 保存后的订单实体 */ - async saveOrder(siteId: number, order: UnifiedOrderDTO): Promise { + async saveOrder(siteId: number, order: Partial): Promise { // 将外部订单ID转换为字符串 const externalOrderId = String(order.id) delete order.id @@ -1234,13 +1234,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注入) @@ -1328,7 +1328,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); diff --git a/src/service/statistics.service.ts b/src/service/statistics.service.ts index 4352633..fd0f741 100644 --- a/src/service/statistics.service.ts +++ b/src/service/statistics.service.ts @@ -15,8 +15,19 @@ export class StatisticsService { orderItemRepository: Repository; async getOrderStatistics(params: OrderStatisticsParams) { - const { startDate, endDate, grouping, siteId } = params; + const { startDate, endDate, grouping, siteId, country } = params; // const keywords = keyword ? keyword.split(' ').filter(Boolean) : []; + + let siteIds = [] + if (country) { + siteIds = await this.getSiteIds(country) + } + + if (siteId) { + siteIds.push(siteId) + } + + const start = dayjs(startDate).format('YYYY-MM-DD'); const end = dayjs(endDate).add(1, 'd').format('YYYY-MM-DD'); let sql @@ -54,6 +65,8 @@ export class StatisticsService { AND o.status IN('processing','completed') `; if (siteId) sql += ` AND o.siteId=${siteId}`; + if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`; + sql += ` GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source ), @@ -247,7 +260,10 @@ export class StatisticsService { LEFT JOIN order_item oi ON o.id = oi.orderId WHERE o.date_paid IS NOT NULL AND o.date_paid >= '${start}' AND o.date_paid < '${end}' - AND o.status IN ('processing','completed') + AND o.status IN ('processing','completed')`; + if (siteId) sql += ` AND o.siteId=${siteId}`; + if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`; + sql +=` GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source ), order_sales_summary AS ( @@ -439,7 +455,11 @@ export class StatisticsService { LEFT JOIN first_order f ON o.customer_email = f.customer_email LEFT JOIN order_item oi ON o.id = oi.orderId WHERE o.date_paid IS NOT NULL - AND o.date_paid >= '${start}' AND o.date_paid < '${end}' + AND o.date_paid >= '${start}' AND o.date_paid < '${end}' + `; + if (siteId) sql += ` AND o.siteId=${siteId}`; + if (siteIds.length) sql += ` AND o.siteId IN (${siteIds.join(',')})`; + sql +=` AND o.status IN ('processing','completed') GROUP BY o.id, o.date_paid, o.customer_email, o.total, o.source_type, o.siteId, o.utm_source ), @@ -1314,7 +1334,14 @@ export class StatisticsService { } async getOrderSorce(params) { - const sql = ` + const { country } = params; + + let siteIds = [] + if (country) { + siteIds = await this.getSiteIds(country) + } + + let sql = ` WITH cutoff_months AS ( SELECT DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 MONTH), '%Y-%m') AS start_month, @@ -1326,7 +1353,10 @@ export class StatisticsService { DATE_FORMAT(MIN(date_paid), '%Y-%m') AS first_order_month, SUM(total) AS first_order_total FROM \`order\` - WHERE status IN ('processing', 'completed') + WHERE status IN ('processing', 'completed')`; + if (siteIds.length!=0) sql += ` AND siteId IN ('${siteIds.join("','")}')`; + else sql += ` AND siteId IS NULL `; + sql += ` GROUP BY customer_email ), order_months AS ( @@ -1334,7 +1364,10 @@ export class StatisticsService { customer_email, DATE_FORMAT(date_paid, '%Y-%m') AS order_month FROM \`order\` - WHERE status IN ('processing', 'completed') + WHERE status IN ('processing', 'completed')`; + if (siteIds.length!=0) sql += ` AND siteId IN ('${siteIds.join("','")}')`; + else sql += ` AND siteId IS NULL `; + sql += ` ), filtered_orders AS ( SELECT o.customer_email, o.order_month, u.first_order_month,u.first_order_total, c.start_month @@ -1366,7 +1399,7 @@ export class StatisticsService { ORDER BY order_month DESC, first_order_month_group ` - const inactiveSql = ` + let inactiveSql = ` WITH cutoff_months AS ( SELECT @@ -1381,7 +1414,10 @@ export class StatisticsService { date_paid, total FROM \`order\` - WHERE status IN ('processing', 'completed') + WHERE status IN ('processing', 'completed')`; + if (siteIds.length!=0) inactiveSql += ` AND siteId IN ('${siteIds.join("','")}')`; + else inactiveSql += ` AND siteId IS NULL `; + inactiveSql += ` ), filtered_users AS ( @@ -1524,4 +1560,13 @@ export class StatisticsService { } + async getSiteIds(country: any[]) { + const sql = ` + SELECT DISTINCT sa.siteId as site_id FROM area a left join site_areas_area sa on a.id = sa.areaId WHERE a.code IN ('${country.join("','")}') + ` + const res = await this.orderRepository.query(sql) + return res.map(item => item.site_id) + } + + }