diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 620bae3..90cea59 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -322,25 +322,25 @@ export class LogisticsService { let resShipmentFee: any; if (data.shipmentPlatform === 'uniuni') { resShipmentFee = await this.uniExpressService.getRates(reqBody); - + if (resShipmentFee.status !== 'SUCCESS') { - throw new Error(resShipmentFee.ret_msg); - } - return resShipmentFee.data.totalAfterTax * 100; + throw new Error(resShipmentFee.ret_msg); + } + return resShipmentFee.data.totalAfterTax * 100; } else if (data.shipmentPlatform === 'freightwaves') { const fre_reqBody = await this.convertToFreightwavesRateTry(data); resShipmentFee = await this.freightwavesService.rateTry(fre_reqBody); - + if (resShipmentFee.totalAmount === null) { - throw new Error(resShipmentFee); - } + throw new Error(resShipmentFee); + } return resShipmentFee.totalAmount * 100; } else { throw new Error('不支持的运单平台'); } - - + + } catch (e) { throw e; } diff --git a/src/service/order.service.ts b/src/service/order.service.ts index c900efa..cdcdcd8 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -105,17 +105,17 @@ export class OrderService { async syncOrders(siteId: string) { //TODO: 临时方案,后续记得调整成前端可控制 - const daysRange = 7; + const daysRange = 7; -// 获取当前时间和7天前时间 + // 获取当前时间和7天前时间 const now = new Date(); const sevenDaysAgo = new Date(); sevenDaysAgo.setDate(now.getDate() - daysRange); -// 格式化时间为ISO 8601 + // 格式化时间为ISO 8601 const after = sevenDaysAgo.toISOString(); const before = now.toISOString(); - const orders = await this.wpService.getOrders(siteId,{ + const orders = await this.wpService.getOrders(siteId, { after: after, before: before, }); // 调用 WooCommerce API 获取订单 @@ -168,13 +168,13 @@ export class OrderService { // 更新状态 await this.autoUpdateOrderStatus(siteId, order); if (order.status === OrderStatus.AUTO_DRAFT) { - return; + return; } // 更新订单 if (existingOrder) { - await this.orderModel.update({ id: existingOrder.id }, { orderStatus: this.mapOrderStatus(order.status) }); + await this.orderModel.update({ id: existingOrder.id }, { orderStatus: this.mapOrderStatus(order.status) }); } - const externalOrderId = order.id; + const externalOrderId = order.id; if ( existingOrder && existingOrder.orderStatus !== ErpOrderStatus.COMPLETED && @@ -331,7 +331,7 @@ export class OrderService { externalOrderId: string; orderItems: Record[]; }) { - console.log('saveOrderItems params',params) + console.log('saveOrderItems params', params) const { siteId, orderId, externalOrderId, orderItems } = params; const currentOrderItems = await this.orderItemModel.find({ where: { siteId, externalOrderId: externalOrderId }, @@ -1358,8 +1358,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);