From 375eabe1c4d7dddd77974e2b1274096855ef502a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E7=8F=91?= <huanglong@huanglongdeMac-mini.local>
Date: Thu, 28 Aug 2025 18:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E6=B7=BB=E5=8A=A0permission=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=8F=AA=E6=9F=A5=E8=AF=A210=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controller/order.controller.ts | 3 ++-
 src/service/logistics.service.ts   | 3 ++-
 src/service/order.service.ts       | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

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<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();