Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy

server/dukang-api/src/modules/iam/admin-auth.controller.ts

@@ -1,6 +1,6 @@
 import { Body, Controller, Get, Post, UseGuards } from '@nestjs/common';
 import { AuthService } from './auth.service';
-import { LoginPasswordDto, LoginSmsDto, SendSmsDto } from './dto/auth.dto';
+import { LoginPasswordDto, LoginSmsDto, LoginWechatDto, SendSmsDto } from './dto/auth.dto';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { AuthUser } from '../../common/guards/jwt-auth.guard';
@@ -25,6 +25,11 @@ export class AdminAuthController {
     return this.authService.loginHqPassword(dto.loginName, dto.password, ClientApp.HQ_WEB);
   }
 
+  @Post('login/wechat')
+  wechatLogin(@Body() dto: LoginWechatDto) {
+    return this.authService.loginHqWechat(dto.code, ClientApp.HQ_WEB, dto.platform ?? 'h5');
+  }
+
   @Get('me')
   @UseGuards(JwtAuthGuard)
   me(@CurrentUser() user: AuthUser) {

server/dukang-api/src/modules/iam/auth.service.ts

@@ -567,6 +567,47 @@ export class AuthService {
     });
   }
 
+  async loginHqWechat(code: string, clientApp: ClientApp, platform: 'h5' | 'mini' = 'h5') {
+    this.assertWechatEnabled();
+    const session =
+      platform === 'mini'
+        ? await this.wechatProvider.code2Session(code)
+        : await this.wechatProvider.oauth2AccessToken(code);
+
+    let account = await this.prisma.hqAccount.findFirst({
+      where: { wxOpenId: session.openId },
+    });
+
+    if (!account && this.wechatProvider.isMock()) {
+      account = await this.prisma.hqAccount.findFirst({
+        where: { status: 'ACTIVE' },
+        orderBy: [{ adminRole: 'asc' }, { id: 'asc' }],
+      });
+    }
+
+    if (!account) {
+      throw new BadRequestException('首次登录请使用手机验证码，登录后将自动关联微信');
+    }
+    if (account.status !== 'ACTIVE') throw new BadRequestException('账号已停用');
+
+    account = await this.prisma.hqAccount.update({
+      where: { id: account.id },
+      data: {
+        wxOpenId: session.openId,
+        wxUnionId: session.unionId ?? account.wxUnionId,
+        lastLoginAt: new Date(),
+      },
+    });
+
+    return this.issueToken('HQ', account.id, clientApp, false, undefined, undefined, undefined, undefined, {
+      id: account.id.toString(),
+      phone: account.phone,
+      name: account.name,
+      adminRole: account.adminRole,
+      status: account.status,
+    });
+  }
+
   async getMe(actorType: string, actorId: bigint) {
     if (actorType === 'USER') {
       const user = await this.assertActiveUser(actorId);
@@ -993,6 +1034,15 @@ export class AuthService {
       include: { partner: true },
     });
 
+    if (!account && this.wechatProvider.isMock()) {
+      // preV1 Mock：无绑定微信时回落到演示主账号，方便一键授权登录
+      account = await this.prisma.partnerAccount.findFirst({
+        where: { status: 'ACTIVE' },
+        orderBy: [{ isPrimary: 'desc' }, { id: 'asc' }],
+        include: { partner: true },
+      });
+    }
+
     if (!account) {
       throw new BadRequestException('首次登录请使用手机验证码，登录后将自动关联微信');
     }