zksu
/
API
forked from yoone/API
1
0
Fork 0

Compare commits

..

3 Commits

Author SHA1 Message Date
tikkhun 96a3e5c76d feat(产品服务): 重构产品查询逻辑并添加价格字段
重构 getProductBySiteSku 方法以支持更灵活的查询条件
在 site-product 实体中添加 price 字段
新增 site-product 控制器和服务用于管理站点商品
修改订单服务以支持站点参数传递
2026-01-27 10:33:13 +08:00
zhuotianyuan 8b2aea7038 feat(订单服务): 添加导出XLSX功能并优化导入逻辑
添加exportToXlsx方法支持将数据导出为XLSX格式
重构importWintopayTable方法,增加物流信息回填功能
移除未使用的BatchOperationResult导入
2026-01-26 15:41:30 +08:00
zhuotianyuan 39401aeaa0 feat(订单): 添加CSV文件导入产品功能
在订单控制器和服务中添加导入产品功能,支持通过CSV文件批量导入产品数据
文件解析使用xlsx库自动识别文件类型并处理UTF-8编码
2026-01-26 15:41:30 +08:00
2 changed files with 202 additions and 4 deletions

View File

@ -2,6 +2,7 @@ import {
Body,
Controller,
Del,
Files,
Get,
Inject,
Param,
@ -27,7 +28,6 @@ import {
} from '../dto/order.dto';
import { User } from '../decorator/user.decorator';
import { ErpOrderStatus } from '../enums/base.enum';
@Controller('/order')
export class OrderController {
@Inject()
@ -264,4 +264,21 @@ export class OrderController {
return errorResponse(error?.message || '导出失败');
}
}
// 导入产品(CSV 文件)
@ApiOkResponse()
@Post('/import')
async importWintopay(@Files() files: any) {
try {
// 条件判断:确保存在文件
const file = files?.[0];
if (!file) return errorResponse('未接收到上传文件');
const result = await this.orderService.importWintopayTable(file);
return successResponse(result);
} catch (error) {
return errorResponse(error?.message || error);
}
}
}

View File

@ -1,5 +1,6 @@
import { Inject, Logger, Provide } from '@midwayjs/core';
import { WPService } from './wp.service';
import * as xlsx from 'xlsx';
import { Order } from '../entity/order.entity';
import { In, Like, Repository } from 'typeorm';
import { InjectEntityModel, TypeORMDataSourceManager } from '@midwayjs/typeorm';
@ -32,7 +33,7 @@ import { UpdateStockDTO } from '../dto/stock.dto';
import { StockService } from './stock.service';
import { OrderItemOriginal } from '../entity/order_item_original.entity';
import { SiteApiService } from './site-api.service';
import { SyncOperationResult } from '../dto/api.dto';
import { BatchErrorItem, SyncOperationResult } from '../dto/api.dto';
import * as fs from 'fs';
import * as path from 'path';
@ -2656,6 +2657,82 @@ export class OrderService {
}
}
/**
* XLSX格式
* @param {any[]} data
* @param {Object} options
* @param {string} [options.type='buffer'] :'buffer' | 'string' (XLSX默认返回buffer)
* @param {string} [options.fileName] (使)
* @param {boolean} [options.writeFile=false]
* @returns {string|Buffer} type返回字符串或Buffer
*/
async exportToXlsx(data: any[], options: { type?: 'buffer' | 'string'; fileName?: string; writeFile?: boolean } = {}): Promise<string | Buffer> {
try {
// 检查数据是否为空
if (!data || data.length === 0) {
throw new Error('导出数据不能为空');
}
const { type = 'buffer', fileName, writeFile = false } = options;
// 获取表头
const headers = Object.keys(data[0]);
// 构建二维数组数据(包含表头)
const aoaData = [headers];
data.forEach(item => {
const row = headers.map(key => {
const value = item[key as keyof any];
// 处理undefined和null
if (value === undefined || value === null) {
return '';
}
// 处理日期类型
if (value instanceof Date) {
return value.toISOString();
}
return value;
});
aoaData.push(row);
});
// 创建工作簿和工作表
const workbook = xlsx.utils.book_new();
const worksheet = xlsx.utils.aoa_to_sheet(aoaData);
xlsx.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
// 生成XLSX buffer
const buffer = xlsx.write(workbook, { bookType: 'xlsx', type: 'buffer' });
// 如果需要写入文件
if (writeFile && fileName) {
// 获取当前用户目录
const userHomeDir = os.homedir();
// 构建目标路径(下载目录)
const downloadsDir = path.join(userHomeDir, 'Downloads');
// 确保下载目录存在
if (!fs.existsSync(downloadsDir)) {
fs.mkdirSync(downloadsDir, { recursive: true });
}
const filePath = path.join(downloadsDir, fileName);
// 写入文件
fs.writeFileSync(filePath, buffer);
return filePath;
}
// 根据类型返回不同结果
if (type === 'string') {
return buffer.toString('base64');
}
return buffer;
} catch (error) {
throw new Error(`导出XLSX文件失败: ${error.message}`);
}
}
/**
*
* @param str
@ -2731,4 +2808,108 @@ export class OrderService {
return result;
}
// 从 CSV 导入产品;存在则更新,不存在则创建
/**
* Wintopay
* @param file
* @returns
*/
async importWintopayTable(file: any): Promise<any> {
let updated = 0;
const errors: BatchErrorItem[] = [];
// 解析文件获取工作表
let buffer: Buffer;
if (Buffer.isBuffer(file)) {
buffer = file;
} else if (file?.data) {
if (typeof file.data === 'string') {
buffer = fs.readFileSync(file.data);
} else {
buffer = file.data;
}
} else {
throw new Error('无效的文件输入');
}
const workbook = xlsx.read(buffer, { type: 'buffer', codepage: 65001 });
const worksheet = workbook.Sheets[workbook.SheetNames[0]];
// 获取表头和数据
const jsonData = xlsx.utils.sheet_to_json(worksheet, { header: 1 });
const headers = jsonData[0] as string[];
const dataRows = jsonData.slice(1) as any[][];
// 查找各列的索引
const columnIndices = {
orderNumber: headers.indexOf('订单号'),
logisticsCompany: headers.indexOf('物流公司'),
trackingNumber: headers.indexOf('单号-单元格文本格式'),
orderCreateTime: headers.indexOf('订单创建时间'),
orderEmail: headers.indexOf('订单邮箱'),
orderSite: headers.indexOf('订单网站'),
name: headers.indexOf('姓名'),
refund: headers.indexOf('退款'),
chargeback: headers.indexOf('拒付')
};
// 遍历数据行
for (let i = 0; i < dataRows.length; i++) {
const row = dataRows[i];
const orderNumber = row[columnIndices.orderNumber];
if (!orderNumber) {
errors.push({ identifier: `${i + 2}`, error: '订单号为空' });
continue;
}
try {
let orderNumbers="";
if (orderNumber.includes('_')&&orderNumber.includes('-')) {
orderNumbers = orderNumber.split('_')[0].toString();
orderNumbers = orderNumbers.split('-')[1];
}
// 通过订单号查询订单
const order = await this.orderModel.findOne({ where: { externalOrderId: orderNumbers } });
if (order) {
// 通过orderId查询fulfillments
const fulfillments = await this.orderFulfillmentModel.find({ where: { order_id: order.id } });
if (fulfillments && fulfillments.length > 0) {
const fulfillment = fulfillments[0]; // 假设每个订单只有一个物流信息
// 回填物流信息
if (columnIndices.logisticsCompany !== -1) {
row[columnIndices.logisticsCompany] = fulfillment.shipping_provider || '';
}
if (columnIndices.trackingNumber !== -1) {
row[columnIndices.trackingNumber] = fulfillment.tracking_number || '';
}
updated++;
}
}
} catch (error) {
errors.push({ identifier: `${i + 2}`, error: `处理失败: ${error.message}` });
}
}
// 将数据转换为对象数组,与 exportOrder 方法返回格式一致
const resultData = dataRows.map((row, index) => {
const rowData: any = {};
headers.forEach((header, colIndex) => {
rowData[header] = row[colIndex] || '';
});
// 添加行号信息
rowData['行号'] = index + 2;
return rowData;
});
// 返回XLSX buffer内容给前端
// const xlsxBuffer = await this.exportToXlsx(resultData, { type: 'buffer' });
return resultData;
}
}