yoone
/
API
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: 主要修复订单 save 逻辑 #46

Merged
longbot merged 6 commits from zksu/API:main into main 2026-01-10 07:18:26 +00:00
Conversation 0 Commits 6 Files Changed 6 +2972 -263
6 changed files with 2972 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4eb45af452 - Show all commits

26
src/dto/order.dto.ts
View File

@ -98,14 +98,10 @@ export class QueryOrderDTO {
}
export class QueryOrderSalesDTO {
@ApiProperty()
@ApiProperty({ description: '是否为原产品还是库存产品' })
@Rule(RuleType.bool().default(false))
isSource: boolean;
@ApiProperty()
@Rule(RuleType.bool().default(false))
exceptPackage: boolean;
@ApiProperty({ example: '1', description: '页码' })
@Rule(RuleType.number())
current: number;
@ -114,19 +110,31 @@ export class QueryOrderSalesDTO {
@Rule(RuleType.number())
pageSize: number;
@ApiProperty()
@ApiProperty({ description: '排序对象,格式如 { productName: "asc", sku: "desc" }',type: 'any', required: false })
@Rule(RuleType.object().allow(null))
orderBy?: Record<string, 'asc' | 'desc'>;
// filter
@ApiProperty({ description: '是否排除套餐' })
@Rule(RuleType.bool().default(false))
exceptPackage: boolean;
@ApiProperty({ description: '站点ID' })
@Rule(RuleType.number())
siteId: number;
@ApiProperty()
@ApiProperty({ description: '名称' })
@Rule(RuleType.string())
name: string;
@ApiProperty()
@ApiProperty({ description: 'SKU' })
@Rule(RuleType.string())
sku: string;
@ApiProperty({ description: '开始日期' })
@Rule(RuleType.date())
startDate: Date;
@ApiProperty()
@ApiProperty({ description: '结束日期' })
@Rule(RuleType.date())
endDate: Date;
}

8
src/entity/order.entity.ts
View File

@ -272,6 +272,14 @@ export class Order {
@Expose()
updatedAt: Date;
@ApiProperty({ type: 'json', nullable: true, description: '订单项列表' })
@Expose()
orderItems?: any[];
@ApiProperty({ type: 'json', nullable: true, description: '销售项列表' })
@Expose()
orderSales?: any[];
// 在插入或更新前处理用户代理字符串
@BeforeInsert()
@BeforeUpdate()

40
src/entity/order_sale.entity.ts
View File

@ -75,7 +75,7 @@ export class OrderSale {
@ApiProperty({ nullable: true })
@Column({ type: 'int', nullable: true })
@Expose()
size: number | null;
size: number | null; // 其实是 strength
@ApiProperty()
@Column({ default: false })
@ -98,24 +98,24 @@ export class OrderSale {
@Expose()
updatedAt?: Date;
// === 自动计算逻辑 ===
@BeforeInsert()
@BeforeUpdate()
setFlags() {
if (!this.name) return;
const lower = this.name.toLowerCase();
this.isYoone = lower.includes('yoone');
this.isZex = lower.includes('zex');
this.isYooneNew = this.isYoone && lower.includes('new');
let size: number | null = null;
const sizes = [3, 6, 9, 12, 15, 18];
for (const s of sizes) {
if (lower.includes(s.toString())) {
size = s;
break;
}
}
this.size = size;
}
// // === 自动计算逻辑 ===
// @BeforeInsert()
// @BeforeUpdate()
// setFlags() {
// if (!this.name) return;
// const lower = this.name.toLowerCase();
// this.isYoone = lower.includes('yoone');
// this.isZex = lower.includes('zex');
// this.isYooneNew = this.isYoone && lower.includes('new');
// let size: number | null = null;
// const sizes = [3, 6, 9, 12, 15, 18];
// for (const s of sizes) {
// if (lower.includes(s.toString())) {
// size = s;
// break;
// }
// }
// this.size = size;
// }
}

2651
src/service/order.service copy.ts Normal file
View File

File diff suppressed because it is too large Load Diff

468
src/service/order.service.ts
View File

@ -110,6 +110,8 @@ export class OrderService {
@Logger()
logger; // 注入 Logger 实例
@Inject()
productService: ProductService;
/**
* 批量同步订单
@ -146,8 +148,8 @@ export class OrderService {
const existingOrder = await this.orderModel.findOne({
where: { externalOrderId: String(order.id), siteId: siteId },
});
if(!existingOrder){
console.log("数据库中不存在",order.id, '订单状态:', order.status )
if (!existingOrder) {
console.log("数据库中不存在", order.id, '订单状态:', order.status)
}
// 同步单个订单
await this.syncSingleOrder(siteId, order);
@ -211,8 +213,8 @@ export class OrderService {
const existingOrder = await this.orderModel.findOne({
where: { externalOrderId: String(order.id), siteId: siteId },
});
if(!existingOrder){
console.log("数据库不存在", siteId , "订单:",order.id, '订单状态:' + order.status )
if (!existingOrder) {
console.log("数据库不存在", siteId, "订单:", order.id, '订单状态:' + order.status)
}
// 同步单个订单
await this.syncSingleOrder(siteId, order, true);
@ -271,7 +273,7 @@ export class OrderService {
try {
const site = await this.siteService.get(siteId);
// 仅处理 WooCommerce 站点
if(site.type !== 'woocommerce'){
if (site.type !== 'woocommerce') {
return
}
// 将订单状态同步到 WooCommerce,然后切换至下一状态
@ -281,6 +283,11 @@ export class OrderService {
console.error('更新订单状态失败,原因为:', error)
}
}
async getOrderByExternalOrderId(siteId: number, externalOrderId: string) {
return await this.orderModel.findOne({
where: { externalOrderId: String(externalOrderId), siteId },
});
}
/**
* 同步单个订单
* 流程说明:
@ -304,6 +311,7 @@ export class OrderService {
* @param order 订单数据
* @param forceUpdate 是否强制更新
*/
async syncSingleOrder(siteId: number, order: UnifiedOrderDTO, forceUpdate = false) {
async syncSingleOrder(siteId: number, order: UnifiedOrderDTO, forceUpdate = false) {
// 从订单数据中解构出各个子项
let {
@ -318,47 +326,27 @@ export class OrderService {
// console.log('同步进单个订单', order)
// 如果订单状态为 AUTO_DRAFT,则跳过处理
if (order.status === OrderStatus.AUTO_DRAFT) {
this.logger.debug('订单状态为 AUTO_DRAFT,跳过处理', siteId, order.id)
return;
}
// 检查数据库中是否已存在该订单
const existingOrder = await this.orderModel.findOne({
where: { externalOrderId: String(order.id), siteId: siteId },
});
// 自动更新订单状态(如果需要)
// if(!order.is_editable && !forceUpdate){
// this.logger.debug('订单不可编辑,跳过处理', siteId, order.id)
// return;
// }
// 自动转换远程订单的状态(如果需要)
await this.autoUpdateOrderStatus(siteId, order);
if(existingOrder){
// 矫正数据库中的订单数据
const updateData: any = { status: order.status };
if (this.canUpdateErpStatus(existingOrder.orderStatus)) {
updateData.orderStatus = this.mapOrderStatus(order.status as any);
}
// 更新订单主数据
await this.orderModel.update({ externalOrderId: String(order.id), siteId: siteId }, updateData);
// 更新 fulfillments 数据
await this.saveOrderFulfillments({
siteId,
orderId: existingOrder.id,
externalOrderId:order.id,
fulfillments: fulfillments,
});
}
const externalOrderId = String(order.id);
// 如果订单从未完成变为完成状态,则更新库存
// 这里的 saveOrder 已经包括了创建订单和更新订单
let orderRecord: Order = await this.saveOrder(siteId, orderData);
// 如果订单从未完成变为完成状态,则更新库存
if (
existingOrder &&
existingOrder.orderStatus !== ErpOrderStatus.COMPLETED &&
orderRecord &&
orderRecord.orderStatus !== ErpOrderStatus.COMPLETED &&
orderData.status === OrderStatus.COMPLETED
) {
this.updateStock(existingOrder);
await this.updateStock(orderRecord);
// 不再直接返回,继续执行后续的更新操作
}
// 如果订单不可编辑且不强制更新,则跳过处理
if (existingOrder && !existingOrder.is_editable && !forceUpdate) {
return;
}
// 保存订单主数据
const orderRecord = await this.saveOrder(siteId, orderData);
const externalOrderId = String(order.id);
const orderId = orderRecord.id;
// 保存订单项
await this.saveOrderItems({
@ -462,13 +450,14 @@ export class OrderService {
* @param order 订单数据
* @returns 保存后的订单实体
*/
async saveOrder(siteId: number, order: Partial<UnifiedOrderDTO>): Promise<Order> {
// 这里 omit 是因为处理在外头了 其实 saveOrder 应该包括 savelineitems 等
async saveOrder(siteId: number, order: Omit<UnifiedOrderDTO, 'line_items'|'refunds'>): Promise<Order> {
// 将外部订单ID转换为字符串
const externalOrderId = String(order.id)
delete order.id
// 创建订单实体对象
const entity = plainToClass(Order, {...order, externalOrderId, siteId});
const entity = plainToClass(Order, { ...order, externalOrderId, siteId });
// 检查数据库中是否已存在该订单
const existingOrder = await this.orderModel.findOne({
where: { externalOrderId, siteId: siteId },
@ -711,6 +700,8 @@ export class OrderService {
*
* @param orderItem 订单项实体
*/
// TODO 这里存的是库存商品实际
// 所以叫做 orderInventoryItems 可能更合适
async saveOrderSale(orderItem: OrderItem) {
const currentOrderSale = await this.orderSaleModel.find({
where: {
@ -729,46 +720,44 @@ export class OrderService {
});
if (!product) return;
const orderSales: OrderSale[] = [];
if (product.components && product.components.length > 0) {
for (const comp of product.components) {
const baseProduct = await this.productModel.findOne({
const componentDetails: { product: Product, quantity: number }[] = product.components?.length > 0 ? await Promise.all(product.components.map(async comp => {
return {
product: await this.productModel.findOne({
where: { sku: comp.sku },
});
if (baseProduct) {
const orderSaleItem: OrderSale = plainToClass(OrderSale, {
orderId: orderItem.orderId,
siteId: orderItem.siteId,
externalOrderItemId: orderItem.externalOrderItemId,
productId: baseProduct.id,
name: baseProduct.name,
quantity: comp.quantity * orderItem.quantity,
sku: comp.sku,
isPackage: orderItem.name.toLowerCase().includes('package'),
});
orderSales.push(orderSaleItem);
}
}),
quantity: comp.quantity * orderItem.quantity,
}
} else {
const orderSaleItem: OrderSale = plainToClass(OrderSale, {
})) : [{ product, quantity: orderItem.quantity }];
const orderSales: OrderSale[] = componentDetails.map(componentDetail => {
const attrsObj = this.productService.getAttributesObject(product.attributes)
const orderSale = plainToClass(OrderSale, {
orderId: orderItem.orderId,
siteId: orderItem.siteId,
externalOrderItemId: orderItem.externalOrderItemId,
productId: product.id,
name: product.name,
quantity: orderItem.quantity,
sku: product.sku,
isPackage: orderItem.name.toLowerCase().includes('package'),
productId: componentDetail.product.id,
name: componentDetail.product.name,
quantity: componentDetail.quantity * orderItem.quantity,
sku: componentDetail.product.sku,
isPackage: componentDetail.product.type === 'bundle',
isYoone: attrsObj?.['brand']?.name === 'yoone',
isZyn: attrsObj?.['brand']?.name === 'zyn',
isYooneNew: attrsObj?.['brand']?.name === 'yoone' && attrsObj?.['version']?.name === 'new',
size: this.extractNumberFromString(attrsObj?.['strength']?.name) || null,
});
orderSales.push(orderSaleItem);
}
return orderSale
})
if (orderSales.length > 0) {
await this.orderSaleModel.save(orderSales);
}
}
extractNumberFromString(str: string): number {
if (!str) return 0;
const num = parseInt(str, 10);
return isNaN(num) ? 0 : num;
}
/**
* 保存订单退款信息
@ -1195,7 +1184,53 @@ export class OrderService {
) END
),
JSON_ARRAY()
) as fulfillments
) as fulfillments,
(
SELECT COALESCE(
JSON_ARRAYAGG(
JSON_OBJECT(
'id', oi.id,
'name', oi.name,
'orderId', oi.orderId,
'siteId', oi.siteId,
'externalOrderId', oi.externalOrderId,
'externalOrderItemId', oi.externalOrderItemId,
'externalProductId', oi.externalProductId,
'externalVariationId', oi.externalVariationId,
'quantity', oi.quantity,
'subtotal', oi.subtotal,
'subtotal_tax', oi.subtotal_tax,
'total', oi.total,
'total_tax', oi.total_tax,
'sku', oi.sku,
'price', oi.price
)
),
JSON_ARRAY()
)
FROM order_item oi
WHERE oi.orderId = o.id
) AS orderItems,
(
SELECT COALESCE(
JSON_ARRAYAGG(
JSON_OBJECT(
'id', os.id,
'orderId', os.orderId,
'siteId', os.siteId,
'externalOrderItemId', os.externalOrderItemId,
'productId', os.productId,
'name', os.name,
'sku', os.sku,
'quantity', os.quantity,
'isPackage', os.isPackage
)
),
JSON_ARRAY()
)
FROM order_sale os
WHERE os.orderId = o.id
) AS orderSales
FROM \`order\` o
LEFT JOIN (
SELECT
@ -1429,7 +1464,7 @@ export class OrderService {
* @param params 查询参数
* @returns 销售统计和分页信息
*/
async getOrderSales({ siteId, startDate, endDate, current, pageSize, name, exceptPackage }: QueryOrderSalesDTO) {
async getOrderSales({ siteId, startDate, endDate, current, pageSize, name, exceptPackage, orderBy }: QueryOrderSalesDTO) {
const nameKeywords = name ? name.split(' ').filter(Boolean) : [];
const defaultStart = dayjs().subtract(30, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss');
const defaultEnd = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
@ -1645,11 +1680,12 @@ export class OrderService {
* @returns 订单项统计和分页信息
*/
async getOrderItems({
current,
pageSize,
siteId,
startDate,
endDate,
current,
pageSize,
sku,
name,
}: QueryOrderSalesDTO) {
const nameKeywords = name ? name.split(' ').filter(Boolean) : [];
@ -1907,8 +1943,8 @@ export class OrderService {
const key = it?.externalSubscriptionId
? `sub:${it.externalSubscriptionId}`
: it?.externalOrderId
? `ord:${it.externalOrderId}`
: `id:${it?.id}`;
? `ord:${it.externalOrderId}`
: `id:${it?.id}`;
if (!seen.has(key)) {
seen.add(key);
relatedList.push(it);
@ -2202,14 +2238,14 @@ export class OrderService {
for (const sale of sales) {
const product = await productRepo.findOne({ where: { sku: sale.sku } });
const saleItem = {
orderId: order.id,
siteId: order.siteId,
externalOrderItemId: '-1',
productId: product.id,
name: product.name,
sku: sale.sku,
quantity: sale.quantity,
};
orderId: order.id,
siteId: order.siteId,
externalOrderItemId: '-1',
productId: product.id,
name: product.name,
sku: sale.sku,
quantity: sale.quantity,
};
await orderSaleRepo.save(saleItem);
}
});
@ -2342,83 +2378,83 @@ export class OrderService {
//换货功能更新OrderSale和Orderitem数据
async updateExchangeOrder(orderId: number, data: any) {
throw new Error('暂未实现')
// try {
// const dataSource = this.dataSourceManager.getDataSource('default');
// let transactionError = undefined;
// try {
// const dataSource = this.dataSourceManager.getDataSource('default');
// let transactionError = undefined;
// await dataSource.transaction(async manager => {
// const orderRepo = manager.getRepository(Order);
// const orderSaleRepo = manager.getRepository(OrderSale);
// const orderItemRepo = manager.getRepository(OrderItem);
// await dataSource.transaction(async manager => {
// const orderRepo = manager.getRepository(Order);
// const orderSaleRepo = manager.getRepository(OrderSale);
// const orderItemRepo = manager.getRepository(OrderItem);
// const productRepo = manager.getRepository(ProductV2);
// const productRepo = manager.getRepository(ProductV2);
// const order = await orderRepo.findOneBy({ id: orderId });
// let product: ProductV2;
// const order = await orderRepo.findOneBy({ id: orderId });
// let product: ProductV2;
// await orderSaleRepo.delete({ orderId });
// await orderItemRepo.delete({ orderId });
// for (const sale of data['sales']) {
// product = await productRepo.findOneBy({ sku: sale['sku'] });
// await orderSaleRepo.save({
// orderId,
// siteId: order.siteId,
// productId: product.id,
// name: product.name,
// sku: sale['sku'],
// quantity: sale['quantity'],
// });
// };
// await orderSaleRepo.delete({ orderId });
// await orderItemRepo.delete({ orderId });
// for (const sale of data['sales']) {
// product = await productRepo.findOneBy({ sku: sale['sku'] });
// await orderSaleRepo.save({
// orderId,
// siteId: order.siteId,
// productId: product.id,
// name: product.name,
// sku: sale['sku'],
// quantity: sale['quantity'],
// });
// };
// for (const item of data['items']) {
// product = await productRepo.findOneBy({ sku: item['sku'] });
// for (const item of data['items']) {
// product = await productRepo.findOneBy({ sku: item['sku'] });
// await orderItemRepo.save({
// orderId,
// siteId: order.siteId,
// productId: product.id,
// name: product.name,
// externalOrderId: order.externalOrderId,
// externalProductId: product.externalProductId,
// await orderItemRepo.save({
// orderId,
// siteId: order.siteId,
// productId: product.id,
// name: product.name,
// externalOrderId: order.externalOrderId,
// externalProductId: product.externalProductId,
// sku: item['sku'],
// quantity: item['quantity'],
// });
// sku: item['sku'],
// quantity: item['quantity'],
// });
// };
// };
// //将是否换货状态改为true
// await orderRepo.update(
// order.id
// , {
// is_exchange: true
// });
// //将是否换货状态改为true
// await orderRepo.update(
// order.id
// , {
// is_exchange: true
// });
// //查询这个用户换过多少次货
// const counts = await orderRepo.countBy({
// is_editable: true,
// customer_email: order.customer_email,
// });
// //查询这个用户换过多少次货
// const counts = await orderRepo.countBy({
// is_editable: true,
// customer_email: order.customer_email,
// });
// //批量更新当前用户换货次数
// await orderRepo.update({
// customer_email: order.customer_email
// }, {
// exchange_frequency: counts
// });
// //批量更新当前用户换货次数
// await orderRepo.update({
// customer_email: order.customer_email
// }, {
// exchange_frequency: counts
// });
// }).catch(error => {
// transactionError = error;
// });
// }).catch(error => {
// transactionError = error;
// });
// if (transactionError !== undefined) {
// throw new Error(`更新物流信息错误:${transactionError.message}`);
// }
// return true;
// } catch (error) {
// throw new Error(`更新发货产品失败:${error.message}`);
// }
// if (transactionError !== undefined) {
// throw new Error(`更新物流信息错误:${transactionError.message}`);
// }
// return true;
// } catch (error) {
// throw new Error(`更新发货产品失败:${error.message}`);
// }
}
/**
@ -2474,7 +2510,7 @@ export class OrderService {
return await dataSource.transaction(async manager => {
// 准备查询条件
const whereCondition: any = {};
if(validIds.length > 0){
if (validIds.length > 0) {
whereCondition.id = In(validIds);
}
@ -2570,84 +2606,84 @@ export class OrderService {
* 导出数据为CSV格式
* @param {any[]} data 数据数组
* @param {Object} options 配置选项
* @param {string} [options.type='string'] 输出类型:'string' | 'buffer'
* @param {string} [options.fileName] 文件名(仅当需要写入文件时使用)
* @param {string} [options.type='string'] 输出类型:'string' | 'buffer'
* @param {string} [options.fileName] 文件名(仅当需要写入文件时使用)
* @param {boolean} [options.writeFile=false] 是否写入文件
* @returns {string|Buffer} 根据type返回字符串或Buffer
*/
async exportToCsv(data: any[], options: { type?: 'string' | 'buffer'; fileName?: string; writeFile?: boolean } = {}): Promise<string | Buffer> {
try {
// 检查数据是否为空
if (!data || data.length === 0) {
throw new Error('导出数据不能为空');
}
const { type = 'string', fileName, writeFile = false } = options;
// 生成表头
const headers = Object.keys(data[0]);
let csvContent = headers.join(',') + '\n';
// 处理数据行
data.forEach(item => {
const row = headers.map(key => {
const value = item[key as keyof any];
// 处理特殊字符
if (typeof value === 'string') {
// 转义双引号，将"替换为""
const escapedValue = value.replace(/"/g, '""');
// 如果包含逗号或换行符，需要用双引号包裹
if (escapedValue.includes(',') || escapedValue.includes('\n')) {
return `"${escapedValue}"`;
}
return escapedValue;
}
// 处理日期类型
if (value instanceof Date) {
return value.toISOString();
}
// 处理undefined和null
if (value === undefined || value === null) {
return '';
}
return String(value);
}).join(',');
csvContent += row + '\n';
});
// 如果需要写入文件
if (writeFile && fileName) {
// 获取当前用户目录
const userHomeDir = os.homedir();
// 构建目标路径(下载目录)
const downloadsDir = path.join(userHomeDir, 'Downloads');
// 确保下载目录存在
if (!fs.existsSync(downloadsDir)) {
fs.mkdirSync(downloadsDir, { recursive: true });
async exportToCsv(data: any[], options: { type?: 'string' | 'buffer'; fileName?: string; writeFile?: boolean } = {}): Promise<string | Buffer> {
try {
// 检查数据是否为空
if (!data || data.length === 0) {
throw new Error('导出数据不能为空');
}
const filePath = path.join(downloadsDir, fileName);
const { type = 'string', fileName, writeFile = false } = options;
// 写入文件
fs.writeFileSync(filePath, csvContent, 'utf8');
// 生成表头
const headers = Object.keys(data[0]);
let csvContent = headers.join(',') + '\n';
console.log(`数据已成功导出至 ${filePath}`);
return filePath;
// 处理数据行
data.forEach(item => {
const row = headers.map(key => {
const value = item[key as keyof any];
// 处理特殊字符
if (typeof value === 'string') {
// 转义双引号，将"替换为""
const escapedValue = value.replace(/"/g, '""');
// 如果包含逗号或换行符，需要用双引号包裹
if (escapedValue.includes(',') || escapedValue.includes('\n')) {
return `"${escapedValue}"`;
}
return escapedValue;
}
// 处理日期类型
if (value instanceof Date) {
return value.toISOString();
}
// 处理undefined和null
if (value === undefined || value === null) {
return '';
}
return String(value);
}).join(',');
csvContent += row + '\n';
});
// 如果需要写入文件
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, csvContent, 'utf8');
console.log(`数据已成功导出至 ${filePath}`);
return filePath;
}
// 根据类型返回不同结果
if (type === 'buffer') {
return Buffer.from(csvContent, 'utf8');
}
return csvContent;
} catch (error) {
console.error('导出CSV时出错:', error);
throw new Error(`导出CSV文件失败: ${error.message}`);
}
// 根据类型返回不同结果
if (type === 'buffer') {
return Buffer.from(csvContent, 'utf8');
}
return csvContent;
} catch (error) {
console.error('导出CSV时出错:', error);
throw new Error(`导出CSV文件失败: ${error.message}`);
}
}
/**
* 删除每个分号前面一个左右括号和最后一个左右括号包含的内容（包括括号本身）

8
src/service/product.service.ts
View File

@ -1536,7 +1536,13 @@ export class ProductService {
return dto;
}
getAttributesObject(attributes:DictItem[]){
const obj:any = {}
attributes.forEach(attr=>{
obj[attr.dict.name] = attr
})
return obj
}
// 将单个产品转换为 CSV 行数组
transformProductToCsvRow(
p: Product,