diff --git a/src/controller/order.controller.ts b/src/controller/order.controller.ts index d87082b..cb960d6 100644 --- a/src/controller/order.controller.ts +++ b/src/controller/order.controller.ts @@ -72,8 +72,9 @@ export class OrderController { @User() user ) { try { + console.log('user', user); const count = await this.orderService.getOrderStatus(param); - const data = await this.orderService.getOrders(param, user); + const data = await this.orderService.getOrders(param, user.id); return successResponse({ ...data, count, diff --git a/src/service/logistics.service.ts b/src/service/logistics.service.ts index 3cadd75..9fbc22e 100644 --- a/src/service/logistics.service.ts +++ b/src/service/logistics.service.ts @@ -136,7 +136,8 @@ export class LogisticsService { this.shipmentModel.save(shipment); return shipment.state; } catch (error) { - throw new Error(`更新运单状态失败 ${error.message}`); + throw error; + // throw new Error(`更新运单状态失败 ${error.message}`); } } diff --git a/src/service/order.service.ts b/src/service/order.service.ts index 7b7a06c..199eee7 100644 --- a/src/service/order.service.ts +++ b/src/service/order.service.ts @@ -45,6 +45,9 @@ export class OrderService { @InjectEntityModel(Order) orderModel: Repository; + @InjectEntityModel(User) + userModel: Repository; + @InjectEntityModel(OrderItem) orderItemModel: Repository; @@ -546,7 +549,7 @@ export class OrderService { current, pageSize, customer_email, - }, user = undefined) { + }, userId = undefined) { const parameters: any[] = []; // 基础查询 @@ -629,7 +632,8 @@ export class OrderService { totalQuery += ` AND o.date_created <= ?`; parameters.push(endDate); } - if (!user.isSuper) { + const user = await this.userModel.findOneBy(userId); + if (user?.permissions?.includes('order-10-days')) { sqlQuery += ` AND o.date_created >= ?`; totalQuery += ` AND o.date_created >= ?`; const tenDaysAgo = new Date();