为添加permission增加了只查询10天订单的逻辑
This commit is contained in:
parent
015113d3b3
commit
375eabe1c4
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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}`);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,9 @@ export class OrderService {
|
|||
@InjectEntityModel(Order)
|
||||
orderModel: Repository<Order>;
|
||||
|
||||
@InjectEntityModel(User)
|
||||
userModel: Repository<User>;
|
||||
|
||||
@InjectEntityModel(OrderItem)
|
||||
orderItemModel: Repository<OrderItem>;
|
||||
|
||||
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue