From 8b1db583183b255d938d04c1d1c43a952cc5c267 Mon Sep 17 00:00:00 2001
From: hailin <hailin.zhao@gdzx.xyz>
Date: Wed, 24 Dec 2025 20:50:58 -0800
Subject: [PATCH] =?UTF-8?q?fix(planting-service):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=8EJwtAuth?=
 =?UTF-8?q?Guard=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JwtAuthGuard 设置 req.user.id，controller 需要使用相同字段名

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../contract-signing.controller.ts            | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/services/planting-service/src/api/controllers/contract-signing.controller.ts b/backend/services/planting-service/src/api/controllers/contract-signing.controller.ts
index a90ea111..66960c42 100644
--- a/backend/services/planting-service/src/api/controllers/contract-signing.controller.ts
+++ b/backend/services/planting-service/src/api/controllers/contract-signing.controller.ts
@@ -47,8 +47,8 @@ export class ContractSigningController {
    * 获取用户待签署的合同任务列表
    */
   @Get('pending')
-  async getPendingTasks(@Request() req: { user: { userId: string } }) {
-    const userId = BigInt(req.user.userId);
+  async getPendingTasks(@Request() req: { user: { id: string } }) {
+    const userId = BigInt(req.user.id);
     const tasks = await this.contractSigningService.getPendingTasks(userId);
     return {
       success: true,
@@ -61,8 +61,8 @@ export class ContractSigningController {
    * 用于App启动时检查
    */
   @Get('unsigned')
-  async getUnsignedTasks(@Request() req: { user: { userId: string } }) {
-    const userId = BigInt(req.user.userId);
+  async getUnsignedTasks(@Request() req: { user: { id: string } }) {
+    const userId = BigInt(req.user.id);
     const tasks = await this.contractSigningService.getUnsignedTasks(userId);
     return {
       success: true,
@@ -76,9 +76,9 @@ export class ContractSigningController {
   @Get('tasks/:orderNo')
   async getTask(
     @Param('orderNo') orderNo: string,
-    @Request() req: { user: { userId: string } },
+    @Request() req: { user: { id: string } },
   ) {
-    const userId = BigInt(req.user.userId);
+    const userId = BigInt(req.user.id);
     const task = await this.contractSigningService.getTask(orderNo, userId);
 
     if (!task) {
@@ -101,9 +101,9 @@ export class ContractSigningController {
   @HttpCode(HttpStatus.OK)
   async markScrollComplete(
     @Param('orderNo') orderNo: string,
-    @Request() req: { user: { userId: string } },
+    @Request() req: { user: { id: string } },
   ) {
-    const userId = BigInt(req.user.userId);
+    const userId = BigInt(req.user.id);
 
     try {
       await this.contractSigningService.markScrollComplete(orderNo, userId);
@@ -127,9 +127,9 @@ export class ContractSigningController {
   @HttpCode(HttpStatus.OK)
   async acknowledgeContract(
     @Param('orderNo') orderNo: string,
-    @Request() req: { user: { userId: string } },
+    @Request() req: { user: { id: string } },
   ) {
-    const userId = BigInt(req.user.userId);
+    const userId = BigInt(req.user.id);
 
     try {
       await this.contractSigningService.acknowledgeContract(orderNo, userId);
@@ -154,9 +154,9 @@ export class ContractSigningController {
   async signContract(
     @Param('orderNo') orderNo: string,
     @Body() dto: SignContractDto,
-    @Request() req: { user: { userId: string }; ip: string; headers: { 'user-agent'?: string } },
+    @Request() req: { user: { id: string }; ip: string; headers: { 'user-agent'?: string } },
   ) {
-    const userId = BigInt(req.user.userId);
+    const userId = BigInt(req.user.id);
     const ipAddress = req.ip || 'unknown';
     const userAgent = req.headers['user-agent'] || 'unknown';
 
@@ -195,9 +195,9 @@ export class ContractSigningController {
   async lateSignContract(
     @Param('orderNo') orderNo: string,
     @Body() dto: SignContractDto,
-    @Request() req: { user: { userId: string }; ip: string; headers: { 'user-agent'?: string } },
+    @Request() req: { user: { id: string }; ip: string; headers: { 'user-agent'?: string } },
   ) {
-    const userId = BigInt(req.user.userId);
+    const userId = BigInt(req.user.id);
     const ipAddress = req.ip || 'unknown';
     const userAgent = req.headers['user-agent'] || 'unknown';