diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..dccf702 --- /dev/null +++ b/debug.log @@ -0,0 +1 @@ +[1024/162159.849:ERROR:registration_protocol_win.cc(102)] CreateFile: 系统找不到指定的文件。 (0x2) diff --git a/preview-qr.png b/preview-qr.png new file mode 100644 index 0000000..d88f763 Binary files /dev/null and b/preview-qr.png differ diff --git a/server/.env b/server/.env index 8225d21..4159300 100644 --- a/server/.env +++ b/server/.env @@ -18,6 +18,10 @@ RUSTFS_BUCKET_TEST=xintong-test # 褰撳墠鐢熸晥鐨勫瓨鍌ㄦ《锛氱敓浜=xintong锛屾湰鍦版祴璇曟《鍦 .env.local 涓鐩栦负 xintong-test RUSTFS_BUCKET=xintong +# 寰俊灏忕▼搴忛厤缃紙闈欓粯鐧诲綍 code2session锛 +WX_APPID=wxd582e7ae4c9e1d14 +WX_SECRET=37bb9fcd1a9c9e903101364d6b780e93 + # Redis 閰嶇疆锛堜笌 PostgreSQL / RustFS 鍚屾満閮ㄧ讲锛 REDIS_HOST=222.243.55.42 REDIS_PORT=26678 diff --git a/server/.env.local b/server/.env.local index bf8cc79..570eff1 100644 --- a/server/.env.local +++ b/server/.env.local @@ -7,3 +7,7 @@ PG_PASSWORD=postgres # 鏈湴寮鍙戜娇鐢ㄦ祴璇曟《锛圧ustFS 浠嶅鐢ㄦ湇鍔″櫒涓婄殑鍚屼竴濂楀湴鍧涓庡瘑閽ワ級 RUSTFS_BUCKET=xintong-test + +# 寰俊灏忕▼搴忛厤缃紙闈欓粯鐧诲綍 code2session锛 +WX_APPID=wxd582e7ae4c9e1d14 +WX_SECRET=37bb9fcd1a9c9e903101364d6b780e93 diff --git a/server/src/config/config.default.ts b/server/src/config/config.default.ts index c8eabd8..c2f03f1 100644 --- a/server/src/config/config.default.ts +++ b/server/src/config/config.default.ts @@ -83,6 +83,12 @@ export default { refreshExpiresIn: "7d" }, + // 寰俊灏忕▼搴忥紙闈欓粯鐧诲綍 code2session锛 + wx: { + appId: process.env.WX_APPID || "", + secret: process.env.WX_SECRET || "" + }, + // multipart/form-data 瑙ｆ瀽閰嶇疆锛堢幇鍦虹収鐗囦笂浼狅級 upload: { mode: "file", diff --git a/server/src/configuration.ts b/server/src/configuration.ts index e52b0a9..8dec9c5 100644 --- a/server/src/configuration.ts +++ b/server/src/configuration.ts @@ -7,6 +7,7 @@ import * as Upload from "@midwayjs/upload"; import { join } from "path"; import { AuthMiddleware } from "./middleware/auth.middleware"; import { WorkerAuthMiddleware } from "./middleware/worker_auth.middleware"; +import { CustomerAuthMiddleware } from "./middleware/customer_auth.middleware"; import { RbacMiddleware } from "./middleware/rbac.middleware"; import { LogMiddleware } from "./middleware/log.middleware"; import { JobSchedulerService } from "./service/job_scheduler.service"; @@ -20,8 +21,8 @@ export class ContainerConfigLifeCycle implements ILifeCycle { app!: Koa.Application; async onReady() { - // 娉ㄥ唽鍏ㄥ眬涓棿浠讹紙椤哄簭锛氱數宸ラ壌鏉 鈫 閴存潈 鈫 鏉冮檺 鈫 鏃ュ織锛 - this.app.useMiddleware([WorkerAuthMiddleware, AuthMiddleware, RbacMiddleware, LogMiddleware]); + // 娉ㄥ唽鍏ㄥ眬涓棿浠讹紙椤哄簭锛氱數宸ラ壌鏉 鈫 灏忕▼搴忓鎴烽壌鏉 鈫 绠＄悊绔壌鏉 鈫 鏉冮檺 鈫 鏃ュ織锛 + this.app.useMiddleware([WorkerAuthMiddleware, CustomerAuthMiddleware, AuthMiddleware, RbacMiddleware, LogMiddleware]); try { const scheduler = await this.app.getApplicationContext().getAsync(JobSchedulerService); await scheduler.start(); diff --git a/server/src/controller/customer_app.controller.ts b/server/src/controller/customer_app.controller.ts new file mode 100644 index 0000000..a575841 --- /dev/null +++ b/server/src/controller/customer_app.controller.ts @@ -0,0 +1,91 @@ +import { Body, Controller, Get, Inject, Param, Post, Put, Query, Files } from "@midwayjs/core"; +import { Context } from "@midwayjs/koa"; +import { UploadFileInfo } from "@midwayjs/upload"; +import { CustomerAppService } from "../service/customer_app.service"; +import { UploadService } from "../service/upload.service"; +import { + CustomerAcceptRepairDTO, + CustomerCreateRepairDTO, + CustomerLoginDTO, + CustomerWxBindDTO, + CustomerWxLoginDTO +} from "../dto/customer_app.dto"; + +@Controller("/api/customer-app") +export class CustomerAppController { + @Inject() + ctx!: Context; + + @Inject() + customerAppService!: CustomerAppService; + + @Inject() + uploadService!: UploadService; + + // 璐﹀彿瀵嗙爜鐧诲綍 + @Post("/auth/login") + async login(@Body() dto: CustomerLoginDTO) { + return this.customerAppService.login(dto.phone, dto.password); + } + + // 寰俊闈欓粯鐧诲綍锛堟湭缁戝畾杩斿洖 bindToken锛 + @Post("/auth/wx-login") + async wxLogin(@Body() dto: CustomerWxLoginDTO) { + return this.customerAppService.wxLogin(dto.code); + } + + // 寰俊棣栨缁戝畾锛氭墜鏈哄彿 + 瀵嗙爜 + bindToken + @Post("/auth/wx-bind") + async wxBind(@Body() dto: CustomerWxBindDTO) { + return this.customerAppService.wxBind(dto.bindToken, dto.phone, dto.password); + } + + // 鎴戠殑锛氳处鍙枫佸鎴枫佺粺璁°佸鎴风粡鐞 + @Get("/profile") + async profile() { + return this.customerAppService.profile(this.currentAccountId()); + } + + // 鎶ヤ慨宸ュ崟鍒楄〃锛堟寜鐘舵侀〉绛捐繃婊わ級 + @Get("/repairs") + async listRepairs( + @Query("tab") tab: string, + @Query("page") page: string, + @Query("pageSize") pageSize: string + ) { + return this.customerAppService.listRepairs(this.currentAccountId(), tab, Number(page) || 1, Number(pageSize) || 20); + } + + // 瀹㈡埛鎻愪氦鎶ヤ慨锛岃惤搴撲负寰呭鐞嗗伐鍗 + @Post("/repairs") + async createRepair(@Body() dto: CustomerCreateRepairDTO) { + return this.customerAppService.createRepair(this.currentAccountId(), dto); + } + + // 瀹㈡埛楠屾敹骞惰瘎浠 + @Put("/repairs/:id/accept") + async acceptRepair(@Param("id") id: string, @Body() dto: CustomerAcceptRepairDTO) { + return this.customerAppService.acceptRepair(this.currentAccountId(), Number(id), dto.rating); + } + + // 鎶ヤ慨鐓х墖涓婁紶 + @Post("/upload/image") + async uploadImage(@Files() files: UploadFileInfo[]) { + const file = files && files[0]; + if (!file) return { code: 400, message: "璇烽夋嫨瑕佷笂浼犵殑鍥剧墖", data: null }; + try { + const data = await this.uploadService.uploadFile(file); + return { code: 200, message: "涓婁紶鎴愬姛", data }; + } catch (err: any) { + return { code: 500, message: `鍥剧墖涓婁紶澶辫触锛${err?.message || "瀵硅薄瀛樺偍涓嶅彲鐢"}`, data: null }; + } + } + + private currentAccountId(): number { + const customer = this.ctx.state.customer; + if (!customer?.accountId) { + throw new Error("鏈櫥褰"); + } + return Number(customer.accountId); + } +} diff --git a/server/src/dto/customer_app.dto.ts b/server/src/dto/customer_app.dto.ts new file mode 100644 index 0000000..91aaef9 --- /dev/null +++ b/server/src/dto/customer_app.dto.ts @@ -0,0 +1,44 @@ +import { + IsArray, + IsInt, + IsNotEmpty, + IsOptional, + IsString, + Matches, + Max, + MaxLength, + Min, + MinLength +} from "class-validator"; + +// 璐﹀彿瀵嗙爜鐧诲綍 +export class CustomerLoginDTO { + @IsString() @Matches(/^1\d{10}$/, { message: "璇疯緭鍏ユ纭殑鎵嬫満鍙" }) phone!: string; + @IsString() @MinLength(6) @MaxLength(32) password!: string; +} + +// 寰俊闈欓粯鐧诲綍 +export class CustomerWxLoginDTO { + @IsString() @IsNotEmpty() code!: string; +} + +// 寰俊棣栨缁戝畾锛堟湭缁戝畾 openid 鏃讹紝鐢ㄦ墜鏈哄彿瀵嗙爜瀹屾垚缁戝畾锛 +export class CustomerWxBindDTO { + @IsString() @IsNotEmpty() bindToken!: string; + @IsString() @Matches(/^1\d{10}$/, { message: "璇疯緭鍏ユ纭殑鎵嬫満鍙" }) phone!: string; + @IsString() @MinLength(6) @MaxLength(32) password!: string; +} + +// 鍙戣捣鎶ヤ慨 +export class CustomerCreateRepairDTO { + @IsString() @MaxLength(256) location!: string; + @IsString() @MaxLength(2000) repairContent!: string; + @IsOptional() @IsArray() photos?: string[]; + @IsOptional() @IsInt() buildingId?: number; + @IsOptional() @IsString() @MaxLength(16) floorNo?: string; +} + +// 楠屾敹璇勪环 +export class CustomerAcceptRepairDTO { + @IsInt() @Min(1) @Max(5) rating!: number; +} diff --git a/server/src/middleware/auth.middleware.ts b/server/src/middleware/auth.middleware.ts index d55a911..60d1647 100644 --- a/server/src/middleware/auth.middleware.ts +++ b/server/src/middleware/auth.middleware.ts @@ -5,8 +5,8 @@ import { TokenUtil } from '../util/token'; @Provide() export class AuthMiddleware implements IMiddleware { - // 涓棿浠跺尮閰嶈寖鍥达細鍏ㄥ眬鐢熸晥锛屼絾璺宠繃鍏紑鎺ュ彛涓庣數宸 APP 鎺ュ彛锛堢數宸 APP 璧扮嫭绔嬮壌鏉冿級 - ignore = ['/api/auth/*', '/api/health', '/api/worker-app/*']; + // 涓棿浠跺尮閰嶈寖鍥达細鍏ㄥ眬鐢熸晥锛屼絾璺宠繃鍏紑鎺ュ彛銆佺數宸 APP 涓庡皬绋嬪簭瀹㈡埛鎺ュ彛锛堝悇鑷蛋鐙珛閴存潈锛 + ignore = ['/api/auth/*', '/api/health', '/api/worker-app/*', '/api/customer-app/*']; @Inject() tokenUtil!: TokenUtil; diff --git a/server/src/middleware/customer_auth.middleware.ts b/server/src/middleware/customer_auth.middleware.ts new file mode 100644 index 0000000..0f072bb --- /dev/null +++ b/server/src/middleware/customer_auth.middleware.ts @@ -0,0 +1,52 @@ +import { Middleware, IMiddleware } from "@midwayjs/core"; +import { Context, NextFunction } from "@midwayjs/koa"; +import { Provide, Inject } from "@midwayjs/core"; +import { TokenUtil } from "../util/token"; + +// 灏忕▼搴忓鎴蜂晶鐙珛閴存潈锛氫粎浣滅敤浜 /api/customer-app/*锛 +// 鐧诲綍銆佸井淇＄櫥褰曚笌寰俊缁戝畾鎺ュ彛鏃犻渶閴存潈銆 +@Provide() +export class CustomerAuthMiddleware implements IMiddleware { + match = ["/api/customer-app/*"]; + + @Inject() + tokenUtil!: TokenUtil; + + resolve() { + return async (ctx: Context, next: NextFunction) => { + if (ctx.path.startsWith("/api/customer-app/auth/")) { + await next(); + return; + } + + const authHeader = ctx.header.authorization; + if (!authHeader || !authHeader.startsWith("Bearer ")) { + ctx.status = 401; + ctx.body = { code: 401, message: "鏈櫥褰曟垨鐧诲綍宸茶繃鏈" }; + return; + } + + const token = authHeader.substring(7); + let decoded: any; + try { + decoded = this.tokenUtil.verifyCustomerToken(token); + } catch (error: any) { + ctx.status = 401; + ctx.body = { + code: 401, + message: error.name === "TokenExpiredError" ? "鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰" : "鏈櫥褰曟垨鐧诲綍宸茶繃鏈", + expired: error.name === "TokenExpiredError" + }; + return; + } + + ctx.state.customer = { + accountId: Number(decoded.accountId), + customerId: Number(decoded.customerId), + phone: decoded.phone + }; + + await next(); + }; + } +} diff --git a/server/src/middleware/rbac.middleware.ts b/server/src/middleware/rbac.middleware.ts index 448cfb7..68d2489 100644 --- a/server/src/middleware/rbac.middleware.ts +++ b/server/src/middleware/rbac.middleware.ts @@ -51,7 +51,7 @@ export class RbacMiddleware implements IMiddleware { // 涓棿浠跺尮閰嶈寖鍥达細鍏ㄥ眬鐢熸晥锛岃烦杩囧叕寮鎺ュ彛銆佷华琛ㄧ洏涓庣數宸 APP 鎺ュ彛 // /api/workers/options 涓 /api/workers/recommend 鏀捐锛氫笟鍔″憳鍦ㄣ岄」鐩嫎瀵熸淳鍗曘嶉〉 // 浠嶅彲璋冪敤鐢靛伐涓嬫媺涓庢帹鑽愭帴鍙ｏ紝涓嶅彈 dispatch:worker 鏉冮檺闄愬埗锛堟湰娆￠渶姹傛湁鎰忚璁★級 - ignore = ["/api/auth/*", "/api/health", "/api/dashboard/*", "/api/worker-app/*", "/api/workers/options", "/api/workers/recommend"]; + ignore = ["/api/auth/*", "/api/health", "/api/dashboard/*", "/api/worker-app/*", "/api/customer-app/*", "/api/workers/options", "/api/workers/recommend"]; @Inject() permissionService!: PermissionService; diff --git a/server/src/service/customer_app.service.ts b/server/src/service/customer_app.service.ts new file mode 100644 index 0000000..4956b8d --- /dev/null +++ b/server/src/service/customer_app.service.ts @@ -0,0 +1,444 @@ +import { Config, Inject, Provide } from "@midwayjs/core"; +import { InjectRepository } from "@midwayjs/sequelize"; +import { Repository } from "sequelize-typescript"; +import { Op } from "sequelize"; +import { request } from "undici"; +import CustomerAccount from "../entity/customer_account.entity"; +import Customer from "../entity/customer.entity"; +import CustomerBuilding from "../entity/customer_building.entity"; +import CustomerCircuit from "../entity/customer_circuit.entity"; +import CustomerEquipment from "../entity/customer_equipment.entity"; +import Contract from "../entity/contract.entity"; +import RepairRequest from "../entity/repair_request.entity"; +import RepairDispatch from "../entity/repair_dispatch.entity"; +import Worker from "../entity/worker.entity"; +import SysUser from "../entity/sysUser.entity"; +import { TokenUtil } from "../util/token"; +import { comparePassword } from "../util/crypto"; +import { UploadService } from "./upload.service"; + +// 灏忕▼搴忔姤淇〉绛撅細寰呮帴鍗/澶勭疆涓/寰呯‘璁ら獙鏀/宸插畬鎴 +export type CustomerRepairTab = "all" | "pending" | "processing" | "acceptance" | "completed"; + +@Provide() +export class CustomerAppService { + @Config("wx") + wxConfig!: { appId: string; secret: string }; + + @Inject() + tokenUtil!: TokenUtil; + + @Inject() + uploadService!: UploadService; + + @InjectRepository(CustomerAccount) + accountModel!: Repository; + + @InjectRepository(CustomerBuilding) + buildingModel!: Repository; + + @InjectRepository(CustomerCircuit) + circuitModel!: Repository; + + @InjectRepository(CustomerEquipment) + equipmentModel!: Repository; + + @InjectRepository(Contract) + contractModel!: Repository; + + @InjectRepository(RepairRequest) + requestModel!: Repository; + + @InjectRepository(RepairDispatch) + dispatchModel!: Repository; + + @InjectRepository(Worker) + workerModel!: Repository; + + @InjectRepository(SysUser) + sysUserModel!: Repository; + + // ================= 鐧诲綍 ================= + + async login(phone: string, password: string): Promise { + const account = await this.findActiveAccount({ phone }); + if (!account) return { code: 400, message: "璐﹀彿涓嶅瓨鍦ㄦ垨宸茶绂佺敤", data: null }; + const valid = await comparePassword(password, account.passwordHash); + if (!valid) return { code: 400, message: "瀵嗙爜閿欒", data: null }; + await account.update({ lastLoginAt: new Date() }); + return this.buildLoginResult(account, "鐧诲綍鎴愬姛"); + } + + // 寰俊闈欓粯鐧诲綍锛氬凡缁戝畾 openid 鐩存帴鐧诲綍锛屾湭缁戝畾杩斿洖 bindToken 渚涚粦瀹 + async wxLogin(code: string): Promise { + if (!this.wxConfig?.appId || !this.wxConfig?.secret) { + return { code: 503, message: "寰俊鐧诲綍鏈厤缃紝璇蜂娇鐢ㄨ处鍙峰瘑鐮佺櫥褰", data: null }; + } + + let openid = ""; + try { + const url = + "https://api.weixin.qq.com/sns/jscode2session" + + `?appid=${encodeURIComponent(this.wxConfig.appId)}` + + `&secret=${encodeURIComponent(this.wxConfig.secret)}` + + `&js_code=${encodeURIComponent(code)}` + + "&grant_type=authorization_code"; + const res = await request(url); + const body: any = await res.body.json(); + if (body.errcode) { + return { code: 400, message: `寰俊鐧诲綍澶辫触锛${body.errmsg || body.errcode}`, data: null }; + } + openid = body.openid || ""; + } catch (err: any) { + return { code: 502, message: `寰俊鐧诲綍璇锋眰澶辫触锛${err?.message || "缃戠粶寮傚父"}`, data: null }; + } + + if (!openid) return { code: 400, message: "寰俊鐧诲綍澶辫触锛氭湭杩斿洖 openid", data: null }; + + const account = await this.findActiveAccount({ wxOpenid: openid }); + if (!account) { + return { + code: 200, + message: "寰俊灏氭湭缁戝畾瀹㈡埛璐﹀彿", + data: { needBind: true, bindToken: this.tokenUtil.generateWxBindToken(openid) } + }; + } + + await account.update({ lastLoginAt: new Date() }); + return this.buildLoginResult(account, "鐧诲綍鎴愬姛"); + } + + // 寰俊棣栨缁戝畾锛氭牎楠岃处鍙峰瘑鐮佸悗鍐欏叆 openid 骞剁洿鎺ョ櫥褰 + async wxBind(bindToken: string, phone: string, password: string): Promise { + let decoded: any; + try { + decoded = this.tokenUtil.verifyWxBindToken(bindToken); + } catch { + return { code: 400, message: "缁戝畾鍑嵁宸插け鏁堬紝璇烽噸鏂拌繘鍏ュ皬绋嬪簭", data: null }; + } + + const openid = String(decoded.openid || ""); + const account = await this.findActiveAccount({ phone }, false); + if (!account) return { code: 400, message: "璐﹀彿涓嶅瓨鍦ㄦ垨宸茶绂佺敤", data: null }; + const valid = await comparePassword(password, account.passwordHash); + if (!valid) return { code: 400, message: "瀵嗙爜閿欒", data: null }; + + if (account.wxOpenid && account.wxOpenid !== openid) { + return { code: 400, message: "璇ヨ处鍙峰凡缁戝畾鍏朵粬寰俊锛岃鑱旂郴绠＄悊鍛樿В缁", data: null }; + } + const occupied = await this.accountModel.findOne({ where: { wxOpenid: openid } }); + if (occupied && Number(occupied.id) !== Number(account.id)) { + return { code: 400, message: "璇ュ井淇″凡缁戝畾鍏朵粬瀹㈡埛璐﹀彿", data: null }; + } + + await account.update({ wxOpenid: openid, lastLoginAt: new Date() }); + const fresh = await this.findActiveAccount({ phone }); + return this.buildLoginResult(fresh || account, "寰俊缁戝畾骞剁櫥褰曟垚鍔"); + } + + // ================= 鎴戠殑 ================= + + async profile(accountId: number): Promise { + const account = await this.accountModel.findByPk(accountId, { include: [Customer] }); + if (!account || Number(account.status) !== 1) { + return { code: 401, message: "璐﹀彿涓嶅瓨鍦ㄦ垨宸茶绂佺敤", data: null }; + } + const customer = (account as any).customer as Customer; + if (!customer) return { code: 404, message: "瀹㈡埛淇℃伅涓嶅瓨鍦", data: null }; + + const customerId = Number(customer.id); + const [buildingCount, circuitCount, gatewayCount, contract] = await Promise.all([ + this.buildingModel.count({ where: { customerId } }), + this.circuitModel.count({ where: { customerId } }), + this.equipmentModel.count({ + where: { + customerId, + [Op.or]: [{ equipType: { [Op.like]: "%缃戝叧%" } }, { equipName: { [Op.like]: "%缃戝叧%" } }] + } + }), + this.contractModel.findOne({ + where: { customerId, status: 1 }, + order: [["startDate", "ASC"]] + }) + ]); + + let startDate = (customer as any).created_at ? new Date((customer as any).created_at) : new Date(); + if (contract?.startDate) { + const parsed = new Date(`${contract.startDate}T00:00:00+08:00`); + if (!Number.isNaN(parsed.getTime())) startDate = parsed; + } + const safetyDays = Math.max(1, Math.floor((Date.now() - startDate.getTime()) / 86400000)); + + let salesman: any = null; + if (customer.salesmanId) { + const user = await this.sysUserModel.findByPk(Number(customer.salesmanId), { + attributes: ["id", "realName", "phone"] + }); + if (user) salesman = { id: user.id, name: user.realName || "瀹㈡埛缁忕悊", phone: user.phone || "" }; + } + + return { + code: 200, + message: "鑾峰彇鎴愬姛", + data: { + account: this.toAccountVO(account), + customer: this.toCustomerVO(customer), + stats: { + buildingCount, + circuitCount, + gatewayCount, + // 鏆傛棤缃戝叧鍦ㄧ嚎閬ユ祴鏁版嵁锛屾寜宸叉帴鍏ョ綉鍏虫暟灞曠ず + gatewayOnline: gatewayCount, + safetyDays + }, + salesman, + hotline: "400-880-9119" + } + }; + } + + // ================= 鎶ヤ慨 ================= + + async listRepairs(accountId: number, tab: string = "all", page: number = 1, pageSize: number = 20): Promise { + const account = await this.accountModel.findByPk(accountId); + if (!account) return { code: 401, message: "璐﹀彿涓嶅瓨鍦", data: null }; + const customerId = Number(account.customerId); + + const [requests, dispatches] = await Promise.all([ + this.requestModel.findAll({ where: { customerId }, order: [["requestTime", "DESC"]] }), + this.dispatchModel.findAll({ + where: { customerId }, + include: [{ model: Worker, attributes: ["id", "workerName", "phone", "workerTitle", "rating", "certInfo"] }], + order: [["id", "DESC"]] + }) + ]); + + // 鍚屼竴鎶ヤ慨鍗曞彇鏈鏂颁竴娆℃淳鍗 + const latestDispatch = new Map(); + for (const row of dispatches) { + const repairId = Number(row.repairId); + if (!latestDispatch.has(repairId)) latestDispatch.set(repairId, row); + } + + const all = requests.map((item) => this.toRepairVO(item, latestDispatch.get(Number(item.id)))); + + // 鎶ヤ慨鐓х墖涓庢淳鍗曞鐞嗙収鐗囧潎浠ュ璞 key 鍏ュ簱锛岃鍙栨椂缁熶竴鎹负棰勭鍚 URL + const keys = new Set(); + for (const item of all) { + for (const key of item.photoKeys) keys.add(key); + for (const key of item.processPhotoKeys) keys.add(key); + } + const urlMap = await this.uploadService.getPresignedUrlMap(Array.from(keys)); + for (const item of all) { + item.photos = item.photoKeys.map((key: string) => urlMap[key] || key); + item.dispatch && (item.dispatch.processPhotos = item.processPhotoKeys.map((key: string) => urlMap[key] || key)); + delete item.photoKeys; + delete item.processPhotoKeys; + } + + const counts = { all: all.length, pending: 0, processing: 0, acceptance: 0, completed: 0 }; + for (const item of all) counts[item.category as CustomerRepairTab] += 1; + + const normalizedTab: CustomerRepairTab = ["all", "pending", "processing", "acceptance", "completed"].includes(tab) + ? (tab as CustomerRepairTab) + : "all"; + const filtered = normalizedTab === "all" ? all : all.filter((item) => item.category === normalizedTab); + const safePage = Math.max(1, Number(page) || 1); + const safeSize = Math.min(100, Math.max(1, Number(pageSize) || 20)); + const list = filtered.slice((safePage - 1) * safeSize, safePage * safeSize); + + return { + code: 200, + message: "鑾峰彇鎶ヤ慨宸ュ崟鎴愬姛", + data: { list, counts, tab: normalizedTab, total: filtered.length, page: safePage, pageSize: safeSize } + }; + } + + async createRepair(accountId: number, body: any): Promise { + const account = await this.accountModel.findByPk(accountId, { include: [Customer] }); + if (!account) return { code: 401, message: "璐﹀彿涓嶅瓨鍦", data: null }; + const customer = (account as any).customer as Customer; + const repairNo = await this.generateRepairNo(); + const photos = Array.isArray(body.photos) ? body.photos.filter((p: any) => typeof p === "string").slice(0, 9) : []; + + const record = await this.requestModel.create({ + repairNo, + customerId: Number(account.customerId), + requester: customer?.contactPerson || account.phone, + requesterPhone: account.phone, + requestTime: new Date(), + buildingId: body.buildingId ? Number(body.buildingId) : undefined, + floorNo: body.floorNo || undefined, + location: String(body.location || "").trim(), + repairContent: String(body.repairContent || "").trim(), + photos, + status: 0 + } as any); + + return { + code: 200, + message: "鎶ヤ慨宸叉彁浜わ紝绛夊緟璋冨害娲惧崟", + data: { + id: record.id, + repairNo: record.repairNo, + status: record.status, + requestTime: record.requestTime + } + }; + } + + // 瀹㈡埛楠屾敹骞惰瘎浠凤細娲惧崟宸插畬鎴愪笖鏈瘎鍒 鈫 鍐欏叆璇勫垎銆佹姤淇崟缃负宸插畬鎴 + async acceptRepair(accountId: number, repairId: number, rating: number): Promise { + const account = await this.accountModel.findByPk(accountId); + if (!account) return { code: 401, message: "璐﹀彿涓嶅瓨鍦", data: null }; + + const req = await this.requestModel.findOne({ + where: { id: repairId, customerId: Number(account.customerId) } + }); + if (!req) return { code: 404, message: "鎶ヤ慨宸ュ崟涓嶅瓨鍦", data: null }; + if (Number(req.status) === 2) return { code: 400, message: "璇ュ伐鍗曞凡楠屾敹", data: null }; + + const dispatch = await this.dispatchModel.findOne({ + where: { repairId, customerId: Number(account.customerId) }, + order: [["id", "DESC"]] + }); + if (!dispatch) return { code: 400, message: "璇ュ伐鍗曞皻鏈淳鍗曪紝鏆備笉鑳介獙鏀", data: null }; + if (Number(dispatch.status) !== 1) return { code: 400, message: "鐢靛伐灏氭湭瀹屾垚澶勭悊锛屾殏涓嶈兘楠屾敹", data: null }; + if (dispatch.rating !== null && dispatch.rating !== undefined) { + return { code: 400, message: "璇ュ伐鍗曞凡璇勪环", data: null }; + } + + await dispatch.update({ rating } as any); + await req.update({ status: 2 } as any); + + return { + code: 200, + message: "楠屾敹璇勪环鎴愬姛", + data: { repairId, dispatchId: dispatch.id, rating, status: 2 } + }; + } + + // ================= 鍐呴儴鏂规硶 ================= + + private async findActiveAccount(where: any, withCustomer: boolean = true): Promise { + return this.accountModel.findOne({ + where, + include: withCustomer ? [Customer] : [] + }); + } + + private buildLoginResult(account: CustomerAccount, message: string): any { + const customer = (account as any).customer as Customer; + const accessToken = this.tokenUtil.generateCustomerToken({ + accountId: Number(account.id), + customerId: Number(account.customerId), + phone: account.phone + }); + return { + code: 200, + message, + data: { + accessToken, + account: this.toAccountVO(account), + customer: customer ? this.toCustomerVO(customer) : null + } + }; + } + + private toAccountVO(account: CustomerAccount): any { + return { + id: Number(account.id), + phone: account.phone, + wxBound: !!account.wxOpenid, + lastLoginAt: account.lastLoginAt || null + }; + } + + private toCustomerVO(customer: Customer): any { + return { + id: Number(customer.id), + customerNo: customer.customerNo, + customerName: customer.customerName, + contactPerson: customer.contactPerson || "", + contactPhone: customer.contactPhone || "", + address: customer.address || "", + customerLevel: customer.customerLevel || "", + status: Number(customer.status) + }; + } + + private toRepairVO(req: RepairRequest, dispatch?: RepairDispatch): any { + const category = this.resolveCategory(Number(req.status), dispatch); + const worker = dispatch ? ((dispatch as any).worker as Worker) : null; + const photoKeys = Array.isArray(req.photos) ? req.photos.filter((p: any) => typeof p === "string") : []; + const processPhotoKeys = + dispatch && Array.isArray(dispatch.processPhotos) + ? dispatch.processPhotos.filter((p: any) => typeof p === "string") + : []; + return { + id: Number(req.id), + repairNo: req.repairNo, + requestTime: req.requestTime, + location: req.location, + repairContent: req.repairContent, + floorNo: req.floorNo || "", + photos: photoKeys, + photoKeys, + processPhotoKeys, + status: Number(req.status), + category, + worker: worker + ? { + id: Number(worker.id), + name: worker.workerName, + phone: worker.phone, + title: worker.workerTitle || "鍏变韩鐢靛伐", + rating: worker.rating === null || worker.rating === undefined ? null : Number(worker.rating), + certInfo: worker.certInfo || "" + } + : null, + dispatch: dispatch + ? { + id: Number(dispatch.id), + dispatchNo: dispatch.dispatchNo, + status: Number(dispatch.status), + processPhotos: processPhotoKeys, + rating: dispatch.rating === null || dispatch.rating === undefined ? null : Number(dispatch.rating), + completedAt: dispatch.completedAt || null, + requestTime: dispatch.requestTime || null + } + : null + }; + } + + private resolveCategory(status: number, dispatch?: RepairDispatch): CustomerRepairTab { + if (!dispatch) return status === 2 ? "completed" : "pending"; + const dispatchStatus = Number(dispatch.status); + const rated = dispatch.rating !== null && dispatch.rating !== undefined; + if (dispatchStatus === 0) return "processing"; + if (dispatchStatus === 1 && !rated) return "acceptance"; + if (dispatchStatus === 1 && rated) return "completed"; + return status === 2 ? "completed" : "pending"; + } + + // 鎶ヤ慨鍗曞彿锛欱X-YYYYMMDD-NNN锛堝綋鏃ュ簭鍙凤級 + private async generateRepairNo(retry: number = 0): Promise { + const now = new Date(Date.now() + 8 * 3600 * 1000); + const ymd = `${now.getUTCFullYear()}${String(now.getUTCMonth() + 1).padStart(2, "0")}${String( + now.getUTCDate() + ).padStart(2, "0")}`; + const prefix = `BX-${ymd}-`; + const last = await this.requestModel.findOne({ + where: { repairNo: { [Op.like]: `${prefix}%` } }, + order: [["repairNo", "DESC"]] + }); + const seq = last ? (parseInt(String(last.repairNo).slice(-3), 10) || 0) + 1 : 1; + const repairNo = `${prefix}${String(seq).padStart(3, "0")}`; + const exists = await this.requestModel.findOne({ where: { repairNo } }); + if (exists) { + if (retry < 1) return this.generateRepairNo(retry + 1); + throw new Error("鎶ヤ慨鍗曞彿鐢熸垚鍐茬獊锛岃閲嶈瘯"); + } + return repairNo; + } +} diff --git a/server/src/util/token.ts b/server/src/util/token.ts index c8c555b..4f4d194 100644 --- a/server/src/util/token.ts +++ b/server/src/util/token.ts @@ -72,6 +72,39 @@ export class TokenUtil { return decoded; } + // 鐢熸垚灏忕▼搴忓鎴蜂护鐗岋細鎼哄甫 userType=customer 浠ュ尯鍒嗙鐞嗙/鐢靛伐绔 token + generateCustomerToken(payload: { accountId: number; customerId: number; phone: string }): string { + return jwt.sign({ ...payload, userType: "customer" }, this.jwtConfig.secret, { + expiresIn: this.jwtConfig.expiresIn as jwt.SignOptions["expiresIn"] + }); + } + + // 鏍￠獙灏忕▼搴忓鎴蜂护鐗岋細闄ゆ湁鏁堟湡/绛惧悕澶栵紝杩橀渶 userType 涓 customer + verifyCustomerToken(token: string): any { + const decoded = this.verifyToken(token); + if (!decoded || decoded.userType !== "customer") { + const invalidError = new JsonWebTokenError("鏃犳晥鐨勮璇佷护鐗"); + invalidError.name = "JsonWebTokenError"; + throw invalidError; + } + return decoded; + } + + // 寰俊闈欓粯鐧诲綍鏈粦瀹氭椂鐨勪复鏃跺嚟鎹細浠呯敤浜庣粦瀹氾紝10 鍒嗛挓鏈夋晥 + generateWxBindToken(openid: string): string { + return jwt.sign({ openid, userType: "wx-bind" }, this.jwtConfig.secret, { expiresIn: "10m" }); + } + + verifyWxBindToken(token: string): any { + const decoded = this.verifyToken(token); + if (!decoded || decoded.userType !== "wx-bind") { + const invalidError = new JsonWebTokenError("鏃犳晥鐨勭粦瀹氬嚟鎹"); + invalidError.name = "JsonWebTokenError"; + throw invalidError; + } + return decoded; + } + decodeToken(token: string): any { return jwt.decode(token); }