fix;提交、

server/dukang-api/src/modules/ops/admin-tickets.controller.ts

@@ -1,5 +1,9 @@
 import { Body, Controller, Get, Param, Post, Query, UseGuards } from '@nestjs/common';
 import { HqAuthGuard } from '../../common/guards/hq-auth.guard';
+import { JwtAuthGuard, AuthUser } from '../../common/guards/jwt-auth.guard';
+import { PartnerPermissionGuard } from '../../common/guards/partner-permission.guard';
+import { RequirePartnerPermissions } from '../../common/decorators/partner-permission.decorator';
+import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { HqOperation } from '../../common/hq-operation/hq-operation.decorator';
 import { HqOperationAction } from '../../common/hq-operation/hq-operation.constants';
 import { AdminTicketsService } from './admin-tickets.service';
@@ -27,8 +31,12 @@ export class AdminTicketsController {
     refIdParam: 'id',
     includeBody: true,
   })
-  approve(@Param('id') id: string, @Body() body: { remark?: string }) {
-    return this.service.approve(BigInt(id), body.remark);
+  approve(
+    @CurrentUser() user: AuthUser,
+    @Param('id') id: string,
+    @Body() body: { remark?: string },
+  ) {
+    return this.service.approve(BigInt(id), body.remark, user.actorId.toString());
   }
 
   @Post(':id/reject')
@@ -41,4 +49,52 @@ export class AdminTicketsController {
   reject(@Param('id') id: string, @Body() body: { remark?: string }) {
     return this.service.reject(BigInt(id), body.remark);
   }
+
+  @Post(':id/complete-collab')
+  @HqOperation({
+    action: HqOperationAction.TICKET_APPROVE,
+    refType: 'TICKET',
+    refIdParam: 'id',
+    includeBody: true,
+  })
+  completeCollab(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.completeCollabByHq(BigInt(id), user.actorId.toString());
+  }
+}
+
+@Controller('partner/tickets')
+@UseGuards(JwtAuthGuard, PartnerPermissionGuard)
+@RequirePartnerPermissions('warehouse:manage', 'order:view')
+export class PartnerTicketsController {
+  constructor(private readonly service: AdminTicketsService) {}
+
+  @Get()
+  list(
+    @CurrentUser() user: AuthUser,
+    @Query('page') page?: string,
+    @Query('pageSize') pageSize?: string,
+  ) {
+    return this.service.listPartnerTickets(
+      user.actorId,
+      page ? Number(page) : 1,
+      pageSize ? Number(pageSize) : 20,
+    );
+  }
+
+  @Get(':id')
+  detail(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.getPartnerTicket(user.actorId, BigInt(id));
+  }
+
+  @Post(':id/confirm-pickup')
+  @RequirePartnerPermissions('warehouse:manage')
+  confirmPickup(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.partnerConfirmPickup(user.actorId, BigInt(id));
+  }
+
+  @Post(':id/confirm-reship')
+  @RequirePartnerPermissions('warehouse:manage')
+  confirmReship(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    return this.service.partnerConfirmReship(user.actorId, BigInt(id));
+  }
 }