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

Compare commits

base: yoone:main
Branches Tags
yoone:main
yoone:stable
yoone:div
zhuotianyuan:main
zhuotianyuan:div
zhuotianyuan:stable
zhuotianyuan:dev
yoone:v1.0
..
compare: zhuotianyuan:stable
Branches Tags
zhuotianyuan:main
zhuotianyuan:div
zhuotianyuan:stable
zhuotianyuan:dev
yoone:main
yoone:stable
yoone:div
yoone:v1.0

1 Commits
main ... stable

Author SHA1 Message Date
zhuotianyuan 3fe42c22e6 feat(物流): 添加freightwaves物流平台支持 
实现freightwaves物流平台的集成，包括：
1. 新增freightwaves服务类，提供订单创建、查询等功能
2. 添加定时任务同步运单状态
3. 扩展物流DTO以支持多平台选择
4. 修改物流服务支持freightwaves平台订单处理
 2026-01-29 11:34:58 +08:00
13 changed files with 216 additions and 383 deletions
Show Stats Expand all files Collapse all files

2
src/adapter/shopyy.adapter.ts
View File

@ -996,6 +996,7 @@ export class ShopyyAdapter implements ISiteAdapter {
private async getProductBySku(sku: string): Promise<UnifiedProductDTO> { private async getProductBySku(sku: string): Promise<UnifiedProductDTO> {
// 使用Shopyy API的搜索功能通过sku查询产品 // 使用Shopyy API的搜索功能通过sku查询产品
const response = await this.getAllProducts({ where: { sku } }); const response = await this.getAllProducts({ where: { sku } });
console.log('getProductBySku', response)
const product = response?.[0] const product = response?.[0]
if (!product) { if (!product) {
throw new Error(`未找到sku为${sku}的产品`); throw new Error(`未找到sku为${sku}的产品`);
@ -1125,6 +1126,7 @@ export class ShopyyAdapter implements ISiteAdapter {
// ========== 产品变体映射方法 ========== // ========== 产品变体映射方法 ==========
mapPlatformToUnifiedVariation(variant: ShopyyVariant): UnifiedProductVariationDTO { mapPlatformToUnifiedVariation(variant: ShopyyVariant): UnifiedProductVariationDTO {
// 映射变体 // 映射变体
console.log('ivarianttem', variant)
return { return {
id: variant.id, id: variant.id,
name: variant.title || '', name: variant.title || '',

2
src/config/config.default.ts
View File

@ -42,7 +42,6 @@ import DictSeeder from '../db/seeds/dict.seeder';
import CategorySeeder from '../db/seeds/category.seeder'; import CategorySeeder from '../db/seeds/category.seeder';
import CategoryAttributeSeeder from '../db/seeds/category_attribute.seeder'; import CategoryAttributeSeeder from '../db/seeds/category_attribute.seeder';
import { SiteSku } from '../entity/site-sku.entity'; import { SiteSku } from '../entity/site-sku.entity';
import { logisticsAlias } from '../entity/logistics_alias.entity';
export default { export default {
// use for cookie sign key, should change to your own and keep security // use for cookie sign key, should change to your own and keep security
@ -89,7 +88,6 @@ export default {
Area, Area,
CategoryAttribute, CategoryAttribute,
Category, Category,
logisticsAlias,
], ],
synchronize: true, synchronize: true,
logging: false, logging: false,

6
src/controller/area.controller.ts
View File

@ -40,6 +40,7 @@ export class AreaController {
})); }));
return successResponse(countryList, '查询成功'); return successResponse(countryList, '查询成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }
@ -53,6 +54,7 @@ export class AreaController {
const newArea = await this.areaService.createArea(area); const newArea = await this.areaService.createArea(area);
return successResponse(newArea, '创建成功'); return successResponse(newArea, '创建成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }
@ -66,6 +68,7 @@ export class AreaController {
const updatedArea = await this.areaService.updateArea(id, area); const updatedArea = await this.areaService.updateArea(id, area);
return successResponse(updatedArea, '更新成功'); return successResponse(updatedArea, '更新成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }
@ -78,6 +81,7 @@ export class AreaController {
await this.areaService.deleteArea(id); await this.areaService.deleteArea(id);
return successResponse(null, '删除成功'); return successResponse(null, '删除成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }
@ -91,6 +95,7 @@ export class AreaController {
const { list, total } = await this.areaService.getAreaList(query); const { list, total } = await this.areaService.getAreaList(query);
return successResponse({ list, total }, '查询成功'); return successResponse({ list, total }, '查询成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }
@ -106,6 +111,7 @@ export class AreaController {
} }
return successResponse(area, '查询成功'); return successResponse(area, '查询成功');
} catch (error) { } catch (error) {
console.log(error);
return errorResponse(error?.message || error); return errorResponse(error?.message || error);
} }
} }

4
src/controller/order.controller.ts
View File

@ -42,7 +42,8 @@ export class OrderController {
const result = await this.orderService.syncOrders(siteId, params); const result = await this.orderService.syncOrders(siteId, params);
return successResponse(result); return successResponse(result);
} catch (error) { } catch (error) {
return errorResponse(`同步失败,${error?.message || '未知错误'}`); console.log(error);
return errorResponse('同步失败');
} }
} }
@ -58,6 +59,7 @@ export class OrderController {
const result = await this.orderService.syncOrderById(siteId, orderId); const result = await this.orderService.syncOrderById(siteId, orderId);
return successResponse(result); return successResponse(result);
} catch (error) { } catch (error) {
console.log(error);
return errorResponse('同步失败'); return errorResponse('同步失败');
} }
} }

1
src/dto/logistics.dto.ts
View File

@ -28,7 +28,6 @@ export class ShipmentBookDTO {
@Rule(RuleType.any()) @Rule(RuleType.any())
courierCompany: string; courierCompany: string;
} }
export class ShipmentFeeBookDTO { export class ShipmentFeeBookDTO {
@ApiProperty() @ApiProperty()

34
src/entity/logistics_alias.entity.ts
View File

@ -1,34 +0,0 @@
import { ApiProperty } from '@midwayjs/swagger';
import { Entity, CreateDateColumn, UpdateDateColumn, PrimaryGeneratedColumn, Column } from 'typeorm';
@Entity('logistics_alias')
export class logisticsAlias {
@PrimaryGeneratedColumn()
id: number;
@ApiProperty({ type: 'string' })
@Column()
logistics_company: string
@ApiProperty({ type: 'string' })
@Column()
logistics_alias: string
@ApiProperty({ type: 'string' })
@Column()
platform: string
// 是否可删除
@Column({ default: true, comment: '是否可删除' })
deletable: boolean;
// 创建时间
@CreateDateColumn()
createdAt: Date;
// 更新时间
@UpdateDateColumn()
updatedAt: Date;
}

1
src/entity/site-sku.entity.ts
View File

@ -6,7 +6,6 @@ import {
} from 'typeorm'; } from 'typeorm';
import { ApiProperty } from '@midwayjs/swagger'; import { ApiProperty } from '@midwayjs/swagger';
import { Product } from './product.entity'; import { Product } from './product.entity';
// 这个其实是 alias 后面改一下
@Entity('product_site_sku') @Entity('product_site_sku')
export class SiteSku { export class SiteSku {
@ApiProperty({ description: 'sku'}) @ApiProperty({ description: 'sku'})

96
src/service/Wintopay.service.ts
View File

@ -1,96 +0,0 @@
import { Inject, Provide } from '@midwayjs/core';
import axios from 'axios';
import dayjs = require('dayjs');
import utc = require('dayjs/plugin/utc');
import timezone = require('dayjs/plugin/timezone');
// 扩展dayjs功能
dayjs.extend(utc);
dayjs.extend(timezone);
// Wintopay 物流更新请求接口
interface LogisticsUpdateRequest {
trade_id: string; // 订单的流水号
track_number: string; // 物流单号
track_brand: string; // 物流公司编号
}
// Wintopay 物流更新响应接口
interface LogisticsUpdateResponse {
code: string;
message: string;
data: {
trade_id: string;
track_brand: string;
track_number: string;
time: number;
};
error: any;
request_id: string;
}
@Provide()
export class WintopayService {
@Inject() logger;
// 默认配置
private config = {
//测试环境配置，在生产环境记得换掉
apiBaseUrl: 'https://stage-merchant-api.wintopay.com',
Authorization: 'Bearer kV8w1er8dFw9p9g2kb0mer398hD8hfWk',
};
// 发送请求
private async sendRequest<T>(url: string, data: any): Promise<T> {
try {
const headers = {
'Content-Type': 'application/json',
'Authorization': this.config.Authorization,
};
// 发送请求 - 临时禁用SSL证书验证以解决UNABLE_TO_VERIFY_LEAF_SIGNATURE错误
const response = await axios.post<T>(
`${this.config.apiBaseUrl}${url}`,
data,
{
headers,
httpsAgent: new (require('https').Agent)({
rejectUnauthorized: false
})
}
);
return response.data;
} catch (error) {
this.logger.error('Wintopay API请求失败:', error);
throw error;
}
}
/**
* 更新订单物流信息
* @param params 物流更新参数
* @returns 物流更新响应
*/
async logisticsUpdate(params: LogisticsUpdateRequest): Promise<LogisticsUpdateResponse> {
try {
this.logger.info('开始更新物流信息:', params);
const response = await this.sendRequest<LogisticsUpdateResponse>('/v1/logistics/update', params);
this.logger.info('物流更新成功:', response);
return response;
} catch (error: any) {
this.logger.error('物流更新失败:', error);
// 处理API返回的错误
if (error.response?.data) {
throw new Error(`物流更新失败: ${error.response.data.message || '未知错误'}`);
}
throw new Error(`物流更新请求失败: ${error.message || '网络错误'}`);
}
}
}

6
src/service/customer.service.ts
View File

@ -283,7 +283,7 @@ export class CustomerService {
orderByClause = `ORDER BY ${orderClauses.join(', ')}`; orderByClause = `ORDER BY ${orderClauses.join(', ')}`;
} }
} else { } else {
orderByClause = 'ORDER BY orders DESC, yoone_total DESC'; orderByClause = 'ORDER BY orders ASC, yoone_total DESC';
} }
// 主查询 // 主查询
@ -371,9 +371,9 @@ export class CustomerService {
const { const {
page = 1, page = 1,
per_page = 20, per_page = 20,
where = {}, where ={},
} = params; } = params;
if (where?.phone) { if (where.phone) {
where.phone = Like(`%${where.phone}%`); where.phone = Like(`%${where.phone}%`);
} }

36
src/service/logistics.service.ts
View File

@ -327,20 +327,17 @@ export class LogisticsService {
let resShipmentFee: any; let resShipmentFee: any;
if (data.shipmentPlatform === 'uniuni') { if (data.shipmentPlatform === 'uniuni') {
resShipmentFee = await this.uniExpressService.getRates(reqBody); resShipmentFee = await this.uniExpressService.getRates(reqBody);
if (resShipmentFee.status !== 'SUCCESS') {
throw new Error(resShipmentFee.ret_msg);
}
return resShipmentFee.data.totalAfterTax * 100;
} else if (data.shipmentPlatform === 'freightwaves') { } else if (data.shipmentPlatform === 'freightwaves') {
const fre_reqBody = await this.convertToFreightwavesRateTry(data); const fre_reqBody = await this.convertToFreightwavesRateTry(data);
resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody); resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody);
return resShipmentFee.totalAmount * 100;
} else { } else {
throw new Error('不支持的运单平台'); throw new Error('不支持的运单平台');
} }
if (resShipmentFee.status !== 'SUCCESS') {
throw new Error(resShipmentFee.ret_msg);
}
return resShipmentFee.data.totalAfterTax * 100;
} catch (e) { } catch (e) {
throw e; throw e;
} }
@ -363,7 +360,12 @@ export class LogisticsService {
try { try {
resShipmentOrder = await this.mepShipment(data, order); resShipmentOrder = await this.mepShipment(data, order);
order.orderStatus = ErpOrderStatus.COMPLETED; // 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
if (resShipmentOrder.status === 'SUCCESS' || resShipmentOrder.code === '00000200') {
order.orderStatus = ErpOrderStatus.COMPLETED;
} else {
throw new Error('运单生成失败');
}
const dataSource = this.dataSourceManager.getDataSource('default'); const dataSource = this.dataSourceManager.getDataSource('default');
let transactionError = undefined; let transactionError = undefined;
let shipmentId = undefined; let shipmentId = undefined;
@ -382,8 +384,8 @@ export class LogisticsService {
unique_id = resShipmentOrder.data.uni_order_sn; unique_id = resShipmentOrder.data.uni_order_sn;
state = resShipmentOrder.data.uni_status_code; state = resShipmentOrder.data.uni_status_code;
} else { } else {
co = resShipmentOrder.shipOrderId; co = resShipmentOrder.data?.shipOrderId;
unique_id = resShipmentOrder.shipOrderId; unique_id = resShipmentOrder.data?.shipOrderId;
state = ErpOrderStatus.COMPLETED; state = ErpOrderStatus.COMPLETED;
} }
@ -726,20 +728,14 @@ export class LogisticsService {
}; };
// 添加运单 // 添加运单
resShipmentOrder = await this.uniExpressService.createShipment(reqBody); resShipmentOrder = await this.uniExpressService.createShipment(reqBody);
// 记录物流信息,并将订单状态转到完成,uniuni状态为SUCCESS，tms.freightwaves状态为00000200
if (resShipmentOrder.status !== 'SUCCESS') {
throw new Error('运单生成失败');
}
} }
if (data.shipmentPlatform === 'freightwaves') { if (data.shipmentPlatform === 'freightwaves') {
// 根据TMS系统对接说明文档格式化参数 // 根据TMS系统对接说明文档格式化参数
const reqBody: any = { const reqBody: any = {
// shipCompany: 'UPSYYZ7000NEW', // shipCompany: 'UPSYYZ7000NEW',
shipCompany: data.courierCompany, shipCompany: data.courierCompany || "",
partnerOrderNumber: order.siteId + '-' + order.externalOrderId, partnerOrderNumber: order.siteId + '-1-' + order.externalOrderId,
warehouseId: '25072621030107400060', warehouseId: '25072621030107400060',
shipper: { shipper: {
name: data.details.origin.contact_name, // 姓名 name: data.details.origin.contact_name, // 姓名
@ -815,7 +811,7 @@ export class LogisticsService {
return resShipmentOrder; return resShipmentOrder;
} catch (error) { } catch (error) {
// 处理错误，例如记录日志或抛出异常 // 处理错误，例如记录日志或抛出异常
throw new Error(`物流订单处理失败: ${error}`); throw new Error(`物流订单处理失败: ${error}`);
} }
} }
@ -837,7 +833,7 @@ export class LogisticsService {
// 转换为RateTryRequest格式 // 转换为RateTryRequest格式
const r = { const r = {
//shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少 //shipCompany: 'UPSYYZ7000NEW', // 必填，但ShipmentFeeBookDTO中缺少
shipCompany: data.courierCompany, shipCompany: data.courierCompany || "",
partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成 partnerOrderNumber: `order-${Date.now()}`, // 必填，使用时间戳生成
warehouseId: '25072621030107400060', // 可选，使用stockPointId转换 warehouseId: '25072621030107400060', // 可选，使用stockPointId转换
shipper: { shipper: {

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

@ -42,7 +42,6 @@ import { UnifiedOrderDTO } from '../dto/site-api.dto';
import { CustomerService } from './customer.service'; import { CustomerService } from './customer.service';
import { ProductService } from './product.service'; import { ProductService } from './product.service';
import { Site } from '../entity/site.entity'; import { Site } from '../entity/site.entity';
import { logisticsAlias } from '../entity/logistics_alias.entity';
@Provide() @Provide()
export class OrderService { export class OrderService {
@ -55,9 +54,6 @@ export class OrderService {
@InjectEntityModel(Order) @InjectEntityModel(Order)
orderModel: Repository<Order>; orderModel: Repository<Order>;
@InjectEntityModel(logisticsAlias)
logisticsAliasModel: Repository<logisticsAlias>;
@InjectEntityModel(User) @InjectEntityModel(User)
userModel: Repository<User>; userModel: Repository<User>;
@ -137,7 +133,7 @@ export class OrderService {
async syncOrders(siteId: number, params: Record<string, any> = {}): Promise<SyncOperationResult> { async syncOrders(siteId: number, params: Record<string, any> = {}): Promise<SyncOperationResult> {
// 调用 WooCommerce API 获取订单 // 调用 WooCommerce API 获取订单
const result = await (await this.siteApiService.getAdapter(siteId)).getAllOrders(params); const result = await (await this.siteApiService.getAdapter(siteId)).getAllOrders(params);
this.logger.info('开始进入循环同步订单', result.length, '个订单')
// 初始化同步结果对象 // 初始化同步结果对象
const syncResult: SyncOperationResult = { const syncResult: SyncOperationResult = {
total: result.length, total: result.length,
@ -147,6 +143,7 @@ export class OrderService {
updated: 0, updated: 0,
errors: [] errors: []
}; };
this.logger.info('开始进入循环同步订单', result.length, '个订单')
// 遍历每个订单进行同步 // 遍历每个订单进行同步
for (const order of result) { for (const order of result) {
try { try {
@ -155,7 +152,7 @@ export class OrderService {
where: { externalOrderId: String(order.id), siteId: siteId }, where: { externalOrderId: String(order.id), siteId: siteId },
}); });
if (!existingOrder) { if (!existingOrder) {
this.logger.debug("数据库中不存在", order.id, '订单状态:', order.status) this.logger.debug("数据库中不存在", order.id, '订单状态:', order.status)
} }
// 同步单个订单 // 同步单个订单
await this.syncSingleOrder(siteId, order); await this.syncSingleOrder(siteId, order);
@ -482,20 +479,6 @@ export class OrderService {
const existingOrder = await this.orderModel.findOne({ const existingOrder = await this.orderModel.findOne({
where: { externalOrderId, siteId: siteId }, where: { externalOrderId, siteId: siteId },
}); });
// 提前不然存在就不更新客户信息了
// 创建或更新客户信息
await this.customerService.upsertCustomer({
email: order.customer_email,
site_id: siteId,
origin_id: String(order.customer_id),
billing: order.billing,
shipping: order.shipping,
first_name: order?.billing?.first_name || order?.shipping?.first_name,
last_name: order?.billing?.last_name || order?.shipping?.last_name,
fullname: order?.billing?.fullname || order?.shipping?.fullname || order?.billing?.first_name + ' ' + order?.billing?.last_name,
phone: order?.billing?.phone || order?.shipping?.phone,
// tags:['fromOrder']
});
// 如果订单已存在 // 如果订单已存在
if (existingOrder) { if (existingOrder) {
// 检查是否可以更新 ERP 状态 // 检查是否可以更新 ERP 状态
@ -512,7 +495,20 @@ export class OrderService {
} }
// 如果订单不存在,则映射订单状态 // 如果订单不存在,则映射订单状态
entity.orderStatus = this.mapOrderStatus(entity.status); entity.orderStatus = this.mapOrderStatus(entity.status);
// 创建或更新客户信息
await this.customerService.upsertCustomer({
email: order.customer_email,
site_id: siteId,
origin_id: String(order.customer_id),
billing: order.billing,
shipping: order.shipping,
first_name: order?.billing?.first_name || order?.shipping?.first_name,
last_name: order?.billing?.last_name || order?.shipping?.last_name,
fullname: order?.billing?.fullname || order?.shipping?.fullname,
phone: order?.billing?.phone || order?.shipping?.phone,
// tags:['fromOrder']
});
// const customer = await this.customerModel.findOne({ // const customer = await this.customerModel.findOne({
// where: { email: order.customer_email }, // where: { email: order.customer_email },
// }); // });
@ -634,7 +630,7 @@ export class OrderService {
await this.saveOrderItem(entity); await this.saveOrderItem(entity);
// 为每个订单项创建对应的销售项(OrderSale) // 为每个订单项创建对应的销售项(OrderSale)
const site = await this.siteService.get(siteId); const site = await this.siteService.get(siteId);
await this.saveOrderSale(entity, site); await this.saveOrderSale(entity,site);
} }
} }
@ -724,7 +720,7 @@ export class OrderService {
*/ */
// TODO 这里存的是库存商品实际 // TODO 这里存的是库存商品实际
// 所以叫做 orderInventoryItems 可能更合适 // 所以叫做 orderInventoryItems 可能更合适
async saveOrderSale(orderItem: OrderItem, site: Site) { async saveOrderSale(orderItem: OrderItem,site:Site) {
const currentOrderSale = await this.orderSaleModel.find({ const currentOrderSale = await this.orderSaleModel.find({
where: { where: {
siteId: orderItem.siteId, siteId: orderItem.siteId,
@ -737,13 +733,14 @@ export class OrderService {
if (!orderItem.sku) return; if (!orderItem.sku) return;
// 从数据库查询产品，关联查询组件 // 从数据库查询产品，关联查询组件
const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, orderItem.quantity, site); const componentDetails = await this.productService.getComponentDetailFromSiteSku({ sku: orderItem.sku, name: orderItem.name }, site);
if (!componentDetails?.length) { if(!componentDetails?.length){
return return
} }
const orderSales: OrderSale[] = componentDetails.map(({ product, parentProduct, quantity }) => { const orderSales: OrderSale[] = componentDetails.map(({product, parentProduct, quantity}) => {
if (!product) return null if (!product) return null
console.log('product',product)
const attrsObj = this.productService.getAttributesObject(product.attributes) const attrsObj = this.productService.getAttributesObject(product.attributes)
const orderSale = plainToClass(OrderSale, { const orderSale = plainToClass(OrderSale, {
orderId: orderItem.orderId, orderId: orderItem.orderId,
@ -2458,18 +2455,18 @@ export class OrderService {
*/ */
// TODO // TODO
async exportOrder(ids: number[]) { async exportOrder(ids: number[]) {
// 日期 订单号 姓名地址 邮箱 号码 盒数 换盒数 换货内容 快递号 商品1 数量1 商品2 数量2... // 日期 订单号 姓名地址 邮箱 号码 订单内容 盒数 换盒数 换货内容 快递号
interface ExportData { interface ExportData {
'日期': string; '日期': string;
'订单号': string; '订单号': string;
'姓名地址': string; '姓名地址': string;
'邮箱': string; '邮箱': string;
'号码': string; '号码': string;
'订单内容': string;
'盒数': number; '盒数': number;
'换盒数': number; '换盒数': number;
'换货内容': string; '换货内容': string;
'快递号': string; '快递号': string;
[key: string]: any; // 支持动态添加的商品和数量列
} }
try { try {
@ -2516,15 +2513,6 @@ export class OrderService {
return acc; return acc;
}, {} as Record<number, OrderItem[]>); }, {} as Record<number, OrderItem[]>);
// 计算最大商品数量
let maxItemsCount = 0;
orders.forEach(order => {
const items = orderItemsByOrderId[order.id] || [];
if (items.length > maxItemsCount) {
maxItemsCount = items.length;
}
});
// 构建导出数据 // 构建导出数据
const exportDataList: ExportData[] = orders.map(order => { const exportDataList: ExportData[] = orders.map(order => {
// 获取订单的订单项 // 获取订单的订单项
@ -2533,6 +2521,9 @@ export class OrderService {
// 计算总盒数 // 计算总盒数
const boxCount = items.reduce((total, item) => total + item.quantity, 0); const boxCount = items.reduce((total, item) => total + item.quantity, 0);
// 构建订单内容
const orderContent = items.map(item => `${item.name} x ${item.quantity}`).join('; ');
// 构建姓名地址 // 构建姓名地址
const shipping = order.shipping; const shipping = order.shipping;
const billing = order.billing; const billing = order.billing;
@ -2557,32 +2548,18 @@ export class OrderService {
const exchangeBoxCount = 0; const exchangeBoxCount = 0;
const exchangeContent = ''; const exchangeContent = '';
// 构建基础数据对象 return {
const baseData: ExportData = {
'日期': order.date_created?.toISOString().split('T')[0] || '', '日期': order.date_created?.toISOString().split('T')[0] || '',
'订单号': order.externalOrderId || '', '订单号': order.externalOrderId || '',
'姓名地址': nameAddress, '姓名地址': nameAddress,
'邮箱': order.customer_email || '', '邮箱': order.customer_email || '',
'号码': phone, '号码': phone,
'订单内容': orderContent,
'盒数': boxCount, '盒数': boxCount,
'换盒数': exchangeBoxCount, '换盒数': exchangeBoxCount,
'换货内容': exchangeContent, '换货内容': exchangeContent,
'快递号': trackingNumber '快递号': trackingNumber
}; };
// 添加商品和数量列
items.forEach((item, index) => {
baseData[`商品${index + 1}`] = item.name;
baseData[`数量${index + 1}`] = item.quantity;
});
// 填充空值，确保所有行的列数一致
for (let i = items.length; i < maxItemsCount; i++) {
baseData[`商品${i + 1}`] = '';
baseData[`数量${i + 1}`] = '';
}
return baseData;
}); });
// 返回CSV字符串内容给前端 // 返回CSV字符串内容给前端
@ -2825,116 +2802,107 @@ export class OrderService {
return result; return result;
} }
// 从 CSV 导入产品;存在则更新,不存在则创建 // 从 CSV 导入产品;存在则更新,不存在则创建
/** /**
* 导入 Wintopay 表格并回填物流信息 * 导入 Wintopay 表格并回填物流信息
* @param file 上传的文件 * @param file 上传的文件
* @returns 处理后的数据（包含更新的物流信息） * @returns 处理后的数据（包含更新的物流信息）
*/ */
async importWintopayTable(file: any): Promise<any> { async importWintopayTable(file: any): Promise<any> {
let updated = 0; let updated = 0;
const errors: BatchErrorItem[] = []; const errors: BatchErrorItem[] = [];
// 解析文件获取工作表 // 解析文件获取工作表
let buffer: Buffer; let buffer: Buffer;
if (Buffer.isBuffer(file)) { if (Buffer.isBuffer(file)) {
buffer = file; buffer = file;
} else if (file?.data) { } else if (file?.data) {
if (typeof file.data === 'string') { if (typeof file.data === 'string') {
buffer = fs.readFileSync(file.data); buffer = fs.readFileSync(file.data);
} else { } else {
buffer = file.data; buffer = file.data;
} }
} else { } else {
throw new Error('无效的文件输入'); throw new Error('无效的文件输入');
} }
const workbook = xlsx.read(buffer, { type: 'buffer', codepage: 65001 }); const workbook = xlsx.read(buffer, { type: 'buffer', codepage: 65001 });
const worksheet = workbook.Sheets[workbook.SheetNames[0]]; const worksheet = workbook.Sheets[workbook.SheetNames[0]];
// 获取表头和数据 // 获取表头和数据
const jsonData = xlsx.utils.sheet_to_json(worksheet, { header: 1 }); const jsonData = xlsx.utils.sheet_to_json(worksheet, { header: 1 });
const headers = jsonData[0] as string[]; const headers = jsonData[0] as string[];
const dataRows = jsonData.slice(1) as any[][]; const dataRows = jsonData.slice(1) as any[][];
// 查找各列的索引 // 查找各列的索引
const columnIndices = { const columnIndices = {
orderNumber: headers.indexOf('订单号'), orderNumber: headers.indexOf('订单号'),
logisticsCompany: headers.indexOf('物流公司'), logisticsCompany: headers.indexOf('物流公司'),
trackingNumber: headers.indexOf('单号-单元格文本格式'), trackingNumber: headers.indexOf('单号-单元格文本格式'),
orderCreateTime: headers.indexOf('订单创建时间'), orderCreateTime: headers.indexOf('订单创建时间'),
orderEmail: headers.indexOf('订单邮箱'), orderEmail: headers.indexOf('订单邮箱'),
orderSite: headers.indexOf('订单网站'), orderSite: headers.indexOf('订单网站'),
name: headers.indexOf('姓名'), name: headers.indexOf('姓名'),
refund: headers.indexOf('退款'), refund: headers.indexOf('退款'),
chargeback: headers.indexOf('拒付') chargeback: headers.indexOf('拒付')
}; };
const logisticsAliases = await this.logisticsAliasModel.find(); // 遍历数据行
for (let i = 0; i < dataRows.length; i++) {
const row = dataRows[i];
const orderNumber = row[columnIndices.orderNumber];
// 构建物流公司别名映射 if (!orderNumber) {
const logisticsAliasMap = new Map(logisticsAliases.map(alias => [alias.logistics_alias, alias.logistics_company])); errors.push({ identifier: `行 ${i + 2}`, error: '订单号为空' });
continue;
}
// 遍历数据行 try {
for (let i = 0; i < dataRows.length; i++) { let orderNumbers="";
const row = dataRows[i]; if (orderNumber.includes('_')&&orderNumber.includes('-')) {
const orderNumber = row[columnIndices.orderNumber]; orderNumbers = orderNumber.split('_')[0].toString();
orderNumbers = orderNumbers.split('-')[1];
if (!orderNumber) {
errors.push({ identifier: `行 ${i + 2}`, error: '订单号为空' });
continue;
}
try {
let orderNumbers = orderNumber;
// 确保 orderNumber 是字符串类型
const orderNumberStr = String(orderNumber);
if (orderNumberStr.includes('_') && orderNumberStr.includes('-')) {
orderNumbers = orderNumberStr.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]; // 假设每个订单只有一个物流信息
const shipping_provider = logisticsAliasMap.get(fulfillment.shipping_provider);
// 回填物流信息
if (columnIndices.logisticsCompany !== -1) {
row[columnIndices.logisticsCompany] = shipping_provider || '';
}
if (columnIndices.trackingNumber !== -1) {
row[columnIndices.trackingNumber] = fulfillment.tracking_number || '';
} }
// 通过订单号查询订单
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;
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;
}
} }

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

@ -1785,14 +1785,8 @@ export class ProductService {
attributes: attributes.length > 0 ? attributes : undefined, attributes: attributes.length > 0 ? attributes : undefined,
} }
} }
isMixedSku(sku: string) { // 获取库存单品列表
const splitSKu = sku.split('-') async getComponentDetailFromSiteSku(siteProduct: { sku: string, name?: string }, site: Site): Promise<{ product: Product,parentProduct?: Product, quantity: number }[]> {
const last = splitSKu[splitSKu.length - 1]
const second = splitSKu[splitSKu.length - 2]
// 这里判断 second 是否是数字
return sku.includes('-MX-') || sku.includes('-Mixed-') || /^\d+$/.test(second) && /^\d+$/.test(last)
}
async getComponentDetailFromSiteSku(siteProduct: { sku: string, name: string }, quantity: number = 1, site: Site): Promise<{ product: Product, parentProduct?: Product, quantity: number }[]> {
if (!siteProduct.sku) { if (!siteProduct.sku) {
throw new Error('siteSku 不能为空') throw new Error('siteSku 不能为空')
} }
@ -1801,20 +1795,21 @@ export class ProductService {
if (!product) return if (!product) return
if (!product?.components?.length) { if(!product?.components?.length){
return [{ return [{
product, product,
quantity quantity:1
}] }]
} }
return await Promise.all(product.components.map(async comp => { return await Promise.all(product.components.map(async comp => {
return { return {
product: await this.productModel.findOne({ product: await this.productModel.findOne({
where: { id: comp.productId }, where: { sku: comp.sku },
relations: ['category', 'attributes', 'attributes.dict', 'components']
}), }),
parentProduct: product, // 这里得记录一下他的爸爸用来记录 parentProduct: product, // 这里得记录一下他的爸爸用来记录
quantity: comp.quantity * quantity, quantity: comp.quantity,
} }
})) }))
} }
@ -2037,9 +2032,9 @@ export class ProductService {
// 将工作表转换为 JSON 数组 // 将工作表转换为 JSON 数组
records = xlsx.utils.sheet_to_json(worksheet); records = xlsx.utils.sheet_to_json(worksheet);
this.logger.debug('Parsed records count:', records.length); console.log('Parsed records count:', records.length);
if (records.length > 0) { if (records.length > 0) {
this.logger.debug('First record keys:', Object.keys(records[0])); console.log('First record keys:', Object.keys(records[0]));
} }
return records; return records;
} catch (e: any) { } catch (e: any) {
@ -2053,7 +2048,6 @@ export class ProductService {
let updated = 0; let updated = 0;
const errors: BatchErrorItem[] = []; const errors: BatchErrorItem[] = [];
const records = await this.getRecordsFromTable(file); const records = await this.getRecordsFromTable(file);
this.logger.debug('Total records count:', records.length);
// 逐条处理记录 // 逐条处理记录
for (const rec of records) { for (const rec of records) {
try { try {
@ -2082,7 +2076,7 @@ export class ProductService {
errors.push({ identifier: '' + rec.sku, error: `产品${rec?.sku}导入失败:${e?.message || String(e)}` }); errors.push({ identifier: '' + rec.sku, error: `产品${rec?.sku}导入失败:${e?.message || String(e)}` });
} }
} }
this.logger.info(`导入 ${records.length} 条记录,成功创建 ${created} 条,更新 ${updated} 条,失败 ${errors.length} 条,错误详情:${JSON.stringify(errors)}`); this.logger.debug(`导入 ${records.length} 条记录,成功创建 ${created} 条,更新 ${updated} 条,失败 ${errors.length} 条,错误详情:${JSON.stringify(errors)}`);
return { total: records.length, processed: records.length - errors.length, created, updated, errors }; return { total: records.length, processed: records.length - errors.length, created, updated, errors };
} }
@ -2144,6 +2138,7 @@ export class ProductService {
return product; return product;
} }
// 根据站点SKU查询产品 // 根据站点SKU查询产品
async getProductBySiteSku(siteSku: string, site?: Site): Promise<Product> { async getProductBySiteSku(siteSku: string, site?: Site): Promise<Product> {
// 使用查询构建器来正确查询关联表 // 使用查询构建器来正确查询关联表

46
src/service/wp.service.ts
View File

@ -75,7 +75,7 @@ export class WPService implements IPlatformService {
} }
const data = res.data as T[]; const data = res.data as T[];
const totalPages = Number(res.headers?.['x-wp-totalpages'] ?? 1); const totalPages = Number(res.headers?.['x-wp-totalpages'] ?? 1);
const total = Number(res.headers?.['x-wp-total'] ?? 1) const total = Number(res.headers?.['x-wp-total']?? 1)
return { items: data, total, totalPages, page, per_page, page_size: per_page }; return { items: data, total, totalPages, page, per_page, page_size: per_page };
} }
@ -206,7 +206,7 @@ export class WPService implements IPlatformService {
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString( const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
'base64' 'base64'
); );
console.log(`!!!wpApiUrl, consumerKey, consumerSecret, auth`, site.apiUrl, consumerKey, consumerSecret, auth) console.log(`!!!wpApiUrl, consumerKey, consumerSecret, auth`,site.apiUrl, consumerKey, consumerSecret, auth)
let hasMore = true; let hasMore = true;
while (hasMore) { while (hasMore) {
const config: AxiosRequestConfig = { const config: AxiosRequestConfig = {
@ -259,8 +259,8 @@ export class WPService implements IPlatformService {
// 导出 WooCommerce 产品为特殊CSV(平台特性) // 导出 WooCommerce 产品为特殊CSV(平台特性)
async exportProductsCsvSpecial(site: any, page: number = 1, pageSize: number = 100): Promise<string> { async exportProductsCsvSpecial(site: any, page: number = 1, pageSize: number = 100): Promise<string> {
const list = await this.getProducts(site, { page, per_page: pageSize }); const list = await this.getProducts(site, { page, per_page: pageSize });
const header = ['id', 'name', 'type', 'status', 'sku', 'regular_price', 'sale_price', 'stock_status', 'stock_quantity']; const header = ['id','name','type','status','sku','regular_price','sale_price','stock_status','stock_quantity'];
const rows = (list.items || []).map((p: any) => [p.id, p.name, p.type, p.status, p.sku, p.regular_price, p.sale_price, p.stock_status, p.stock_quantity]); const rows = (list.items || []).map((p: any) => [p.id,p.name,p.type,p.status,p.sku,p.regular_price,p.sale_price,p.stock_status,p.stock_quantity]);
const csv = [header.join(','), ...rows.map(r => r.map(v => String(v ?? '')).join(','))].join('\n'); const csv = [header.join(','), ...rows.map(r => r.map(v => String(v ?? '')).join(','))].join('\n');
return csv; return csv;
} }
@ -289,7 +289,7 @@ export class WPService implements IPlatformService {
const res = await api.get(`orders/${orderId}`); const res = await api.get(`orders/${orderId}`);
return res.data as Record<string, any>; return res.data as Record<string, any>;
} }
async getOrders(siteId: number, params: Record<string, any> = {}): Promise<Record<string, any>[]> { async getOrders(siteId: number,params: Record<string, any> = {}): Promise<Record<string, any>[]> {
const site = await this.siteService.get(siteId); const site = await this.siteService.get(siteId);
const api = this.createApi(site, 'wc/v3'); const api = this.createApi(site, 'wc/v3');
return await this.sdkGetAll<Record<string, any>>(api, 'orders', params); return await this.sdkGetAll<Record<string, any>>(api, 'orders', params);
@ -367,10 +367,10 @@ export class WPService implements IPlatformService {
const api = this.createApi(site, 'wc/v3'); const api = this.createApi(site, 'wc/v3');
// 确保价格为字符串 // 确保价格为字符串
if (data.regular_price !== undefined && data.regular_price !== null) { if (data.regular_price !== undefined && data.regular_price !== null) {
data.regular_price = String(data.regular_price); data.regular_price = String(data.regular_price);
} }
if (data.sale_price !== undefined && data.sale_price !== null) { if (data.sale_price !== undefined && data.sale_price !== null) {
data.sale_price = String(data.sale_price); data.sale_price = String(data.sale_price);
} }
// 处理标签字段,如果为字符串数组则转换为 WooCommerce 所需的对象数组 // 处理标签字段,如果为字符串数组则转换为 WooCommerce 所需的对象数组
if (Array.isArray((data as any).tags)) { if (Array.isArray((data as any).tags)) {
@ -805,7 +805,7 @@ export class WPService implements IPlatformService {
const result = response.data; const result = response.data;
// 转换 WooCommerce 批量操作结果为统一格式 // 转换 WooCommerce 批量操作结果为统一格式
const errors: Array<{ identifier: string, error: string }> = []; const errors: Array<{identifier: string, error: string}> = [];
// WooCommerce 返回格式: { create: [...], update: [...], delete: [...] } // WooCommerce 返回格式: { create: [...], update: [...], delete: [...] }
// 错误信息可能在每个项目的 error 字段中 // 错误信息可能在每个项目的 error 字段中
@ -1022,7 +1022,7 @@ export class WPService implements IPlatformService {
async getMedia(siteId: number, page: number = 1, perPage: number = 20): Promise<{ items: any[], total: number, totalPages: number }> { async getMedia(siteId: number, page: number = 1, perPage: number = 20): Promise<{ items: any[], total: number, totalPages: number }> {
const site = await this.siteService.get(siteId, true); const site = await this.siteService.get(siteId, true);
if (!site) { if (!site) {
throw new Error('站点不存在'); throw new Error('站点不存在');
} }
const endpoint = 'wp/v2/media'; const endpoint = 'wp/v2/media';
const apiUrl = site.apiUrl; const apiUrl = site.apiUrl;
@ -1046,7 +1046,7 @@ export class WPService implements IPlatformService {
}; };
} }
public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> = {}) { public async fetchMediaPaged(site: any, params: Partial<WpMediaGetListParams> = {}) {
const apiUrl = site.apiUrl; const apiUrl = site.apiUrl;
const { consumerKey, consumerSecret } = site as any; const { consumerKey, consumerSecret } = site as any;
const endpoint = 'wp/v2/media'; const endpoint = 'wp/v2/media';
@ -1061,15 +1061,15 @@ export class WPService implements IPlatformService {
} }
}); });
// 检查是否有错误信息 // 检查是否有错误信息
if (response?.data?.message) { if(response?.data?.message){
throw new Error(`获取${apiUrl}条媒体文件失败,原因为${response.data.message}`) throw new Error(`获取${apiUrl}条媒体文件失败,原因为${response.data.message}`)
} }
if (!Array.isArray(response.data)) { if(!Array.isArray(response.data)) {
throw new Error(`获取${apiUrl}条媒体文件失败,原因为返回数据不是数组`); throw new Error(`获取${apiUrl}条媒体文件失败,原因为返回数据不是数组`);
} }
const total = Number(response.headers['x-wp-total'] || 0); const total = Number(response.headers['x-wp-total'] || 0);
const totalPages = Number(response.headers['x-wp-totalpages'] || 0); const totalPages = Number(response.headers['x-wp-totalpages'] || 0);
return { items: response.data, total, totalPages, page: params.page ?? 1, per_page: params.per_page ?? 20, page_size: params.per_page ?? 20 }; return { items: response.data, total, totalPages, page:params.page ?? 1, per_page: params.per_page ?? 20, page_size: params.per_page ?? 20 };
} }
/** /**
* 上传媒体文件 * 上传媒体文件
@ -1091,15 +1091,15 @@ export class WPService implements IPlatformService {
// 假设 file 是 MidwayJS 的 file 对象 // 假设 file 是 MidwayJS 的 file 对象
// MidwayJS 上传文件通常在 tmp 目录，需要读取流 // MidwayJS 上传文件通常在 tmp 目录，需要读取流
formData.append('file', fs.createReadStream(file.data), { formData.append('file', fs.createReadStream(file.data), {
filename: file.filename, filename: file.filename,
contentType: file.mimeType, contentType: file.mimeType,
}); });
// Axios headers for multipart // Axios headers for multipart
const headers = { const headers = {
Authorization: `Basic ${auth}`, Authorization: `Basic ${auth}`,
'Content-Disposition': `attachment; filename=${file.filename}`, 'Content-Disposition': `attachment; filename=${file.filename}`,
...formData.getHeaders(), ...formData.getHeaders(),
}; };
try { try {
@ -1205,12 +1205,10 @@ export class WPService implements IPlatformService {
throw new Error('source_url 不存在'); throw new Error('source_url 不存在');
} }
// 下载源文件为 Buffer // 下载源文件为 Buffer
const resp = await axios.get(srcUrl, { const resp = await axios.get(srcUrl, { responseType: 'arraybuffer', timeout: 30000,
responseType: 'arraybuffer', timeout: 30000, headers: {
headers: { 'User-Agent': 'Mozilla/5.0 (compatible; Node.js Axios)',
'User-Agent': 'Mozilla/5.0 (compatible; Node.js Axios)', } });
}
});
const inputBuffer = Buffer.from(resp.data); const inputBuffer = Buffer.from(resp.data);
// 条件判断 如果下载的 Buffer 为空则抛出错误 // 条件判断 如果下载的 Buffer 为空则抛出错误
if (!inputBuffer || inputBuffer.length === 0) { if (!inputBuffer || inputBuffer.length === 0) {