forked from yoone/API
1
0
Fork 0

为添加permission增加了只查询10天订单的逻辑

This commit is contained in:
黄珑 2025-08-28 18:17:37 +08:00
parent 015113d3b3
commit b0e2c42ad0
3 changed files with 9 additions and 4 deletions

View File

@ -73,7 +73,7 @@ export class OrderController {
) { ) {
try { try {
const count = await this.orderService.getOrderStatus(param); 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({ return successResponse({
...data, ...data,
count, count,

View File

@ -136,7 +136,8 @@ export class LogisticsService {
this.shipmentModel.save(shipment); this.shipmentModel.save(shipment);
return shipment.state; return shipment.state;
} catch (error) { } catch (error) {
throw new Error(`更新运单状态失败 ${error.message}`); throw error;
// throw new Error(`更新运单状态失败 ${error.message}`);
} }
} }

View File

@ -45,6 +45,9 @@ export class OrderService {
@InjectEntityModel(Order) @InjectEntityModel(Order)
orderModel: Repository<Order>; orderModel: Repository<Order>;
@InjectEntityModel(User)
userModel: Repository<User>;
@InjectEntityModel(OrderItem) @InjectEntityModel(OrderItem)
orderItemModel: Repository<OrderItem>; orderItemModel: Repository<OrderItem>;
@ -546,7 +549,7 @@ export class OrderService {
current, current,
pageSize, pageSize,
customer_email, customer_email,
}, user = undefined) { }, userId = undefined) {
const parameters: any[] = []; const parameters: any[] = [];
// 基础查询 // 基础查询
@ -629,7 +632,8 @@ export class OrderService {
totalQuery += ` AND o.date_created <= ?`; totalQuery += ` AND o.date_created <= ?`;
parameters.push(endDate); 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 >= ?`; sqlQuery += ` AND o.date_created >= ?`;
totalQuery += ` AND o.date_created >= ?`; totalQuery += ` AND o.date_created >= ?`;
const tenDaysAgo = new Date(); const tenDaysAgo = new Date();