forked from yoone/API
refactor(service): 统一使用site.apiUrl并优化产品同步逻辑
移除对wpApiUrl的兼容处理,统一使用apiUrl 修复产品同步查询的分页问题,使用Infinity获取全部数据 优化代码格式和缩进
This commit is contained in:
parent
c7480ccc8a
commit
a64e611294
|
|
@ -36,9 +36,8 @@ export class WPService {
|
||||||
* @param namespace API 命名空间,默认 wc/v3;订阅推荐 wcs/v1
|
* @param namespace API 命名空间,默认 wc/v3;订阅推荐 wcs/v1
|
||||||
*/
|
*/
|
||||||
private createApi(site: any, namespace: WooCommerceRestApiVersion = 'wc/v3') {
|
private createApi(site: any, namespace: WooCommerceRestApiVersion = 'wc/v3') {
|
||||||
const url = site.wpApiUrl ?? site.apiUrl; // 中文注释:兼容数据库 Site 与 WpSite 结构
|
|
||||||
return new WooCommerceRestApi({
|
return new WooCommerceRestApi({
|
||||||
url,
|
url: site.apiUrl,
|
||||||
consumerKey: site.consumerKey,
|
consumerKey: site.consumerKey,
|
||||||
consumerSecret: site.consumerSecret,
|
consumerSecret: site.consumerSecret,
|
||||||
version: namespace,
|
version: namespace,
|
||||||
|
|
@ -86,7 +85,7 @@ export class WPService {
|
||||||
param: Record<string, any> = {}
|
param: Record<string, any> = {}
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
try {
|
try {
|
||||||
const apiUrl = site.wpApiUrl ?? site.apiUrl;
|
const apiUrl = site.apiUrl;
|
||||||
const { consumerKey, consumerSecret } = site;
|
const { consumerKey, consumerSecret } = site;
|
||||||
// 构建 URL,规避多/或少/问题
|
// 构建 URL,规避多/或少/问题
|
||||||
const url = this.buildURL(apiUrl, '/wp-json', endpoint);
|
const url = this.buildURL(apiUrl, '/wp-json', endpoint);
|
||||||
|
|
@ -247,7 +246,7 @@ export class WPService {
|
||||||
site: any,
|
site: any,
|
||||||
data: Record<string, any>
|
data: Record<string, any>
|
||||||
): Promise<Boolean> {
|
): Promise<Boolean> {
|
||||||
const apiUrl = site.wpApiUrl ?? site.apiUrl;
|
const apiUrl = site.apiUrl;
|
||||||
const { consumerKey, consumerSecret } = site;
|
const { consumerKey, consumerSecret } = site;
|
||||||
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
||||||
'base64'
|
'base64'
|
||||||
|
|
@ -347,7 +346,7 @@ export class WPService {
|
||||||
orderId: string,
|
orderId: string,
|
||||||
data: Record<string, any>
|
data: Record<string, any>
|
||||||
) {
|
) {
|
||||||
const apiUrl = site.wpApiUrl ?? site.apiUrl;
|
const apiUrl = site.apiUrl;
|
||||||
const { consumerKey, consumerSecret } = site;
|
const { consumerKey, consumerSecret } = site;
|
||||||
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
||||||
'base64'
|
'base64'
|
||||||
|
|
@ -375,7 +374,7 @@ export class WPService {
|
||||||
orderId: string,
|
orderId: string,
|
||||||
trackingId: string,
|
trackingId: string,
|
||||||
): Promise<Boolean> {
|
): Promise<Boolean> {
|
||||||
const apiUrl = site.wpApiUrl ?? site.apiUrl;
|
const apiUrl = site.apiUrl;
|
||||||
const { consumerKey, consumerSecret } = site;
|
const { consumerKey, consumerSecret } = site;
|
||||||
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
|
||||||
'base64'
|
'base64'
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ export class WpProductService {
|
||||||
|
|
||||||
async syncAllSites() {
|
async syncAllSites() {
|
||||||
// 中文注释:从数据库获取所有启用的站点,并逐站点同步产品与变体
|
// 中文注释:从数据库获取所有启用的站点,并逐站点同步产品与变体
|
||||||
const { items } = await this.siteService.list({ current: 1, pageSize: 1000, isDisabled: false }, true);
|
const { items } = await this.siteService.list({ current: 1, pageSize: Infinity, isDisabled: false }, true);
|
||||||
for (const s of items as any[]) {
|
for (const s of items as any[]) {
|
||||||
const site: WpSite = {
|
const site: WpSite = {
|
||||||
id: String(s.id),
|
id: String(s.id),
|
||||||
|
|
@ -54,7 +54,7 @@ export class WpProductService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 同步一个网站
|
||||||
async syncSite(siteId: string) {
|
async syncSite(siteId: string) {
|
||||||
// 中文注释:通过数据库获取站点并转换为 WpSite,用于后续 WooCommerce 同步
|
// 中文注释:通过数据库获取站点并转换为 WpSite,用于后续 WooCommerce 同步
|
||||||
const site = await this.siteService.get(Number(siteId), true);
|
const site = await this.siteService.get(Number(siteId), true);
|
||||||
|
|
@ -70,7 +70,7 @@ export class WpProductService {
|
||||||
|
|
||||||
const externalIds = rawResult.map(item => item.externalProductId);
|
const externalIds = rawResult.map(item => item.externalProductId);
|
||||||
|
|
||||||
const excludeValues = [];
|
const excludeValues = [];
|
||||||
|
|
||||||
const products = await this.wpApiService.getProducts(site);
|
const products = await this.wpApiService.getProducts(site);
|
||||||
for (const product of products) {
|
for (const product of products) {
|
||||||
|
|
@ -84,19 +84,19 @@ const excludeValues = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const filteredIds = externalIds.filter(id => !excludeValues.includes(id));
|
const filteredIds = externalIds.filter(id => !excludeValues.includes(id));
|
||||||
if(filteredIds.length!=0){
|
if (filteredIds.length != 0) {
|
||||||
await this.variationModel.createQueryBuilder('variation')
|
await this.variationModel.createQueryBuilder('variation')
|
||||||
.update()
|
.update()
|
||||||
.set({ on_delete: true })
|
.set({ on_delete: true })
|
||||||
.where(" variation.externalProductId in (:...filteredId) ",{filteredId:filteredIds})
|
.where(" variation.externalProductId in (:...filteredId) ", { filteredId: filteredIds })
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
this.wpProductModel.createQueryBuilder('wp_product')
|
this.wpProductModel.createQueryBuilder('wp_product')
|
||||||
.update()
|
.update()
|
||||||
.set({ on_delete: true })
|
.set({ on_delete: true })
|
||||||
.where(" wp_product.externalProductId in (:...filteredId) ",{filteredId:filteredIds})
|
.where(" wp_product.externalProductId in (:...filteredId) ", { filteredId: filteredIds })
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 控制产品上下架
|
// 控制产品上下架
|
||||||
|
|
@ -505,13 +505,13 @@ const excludeValues = [];
|
||||||
await this.variationModel.createQueryBuilder('variation')
|
await this.variationModel.createQueryBuilder('variation')
|
||||||
.update()
|
.update()
|
||||||
.set({ on_delete: true })
|
.set({ on_delete: true })
|
||||||
.where(" variation.externalProductId = :externalProductId ",{externalProductId:productId})
|
.where(" variation.externalProductId = :externalProductId ", { externalProductId: productId })
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
const sums= await this.wpProductModel.createQueryBuilder('wp_product')
|
const sums = await this.wpProductModel.createQueryBuilder('wp_product')
|
||||||
.update()
|
.update()
|
||||||
.set({ on_delete: true })
|
.set({ on_delete: true })
|
||||||
.where(" wp_product.externalProductId = :externalProductId ",{externalProductId:productId})
|
.where(" wp_product.externalProductId = :externalProductId ", { externalProductId: productId })
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
console.log(sums);
|
console.log(sums);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue