diff --git a/server/application/api/controller/Auth.php b/server/application/api/controller/Auth.php index fc20c6b..61ac1bd 100644 --- a/server/application/api/controller/Auth.php +++ b/server/application/api/controller/Auth.php @@ -171,7 +171,7 @@ class Auth extends Base 'legal_person' => $merchant && isset($merchant['legal_person']) ? (string)$merchant['legal_person'] : '', 'legal_mobile' => $merchant && isset($merchant['legal_mobile']) ? (string)$merchant['legal_mobile'] : '', 'tech_mobile' => $merchant && isset($merchant['tech_mobile']) ? (string)$merchant['tech_mobile'] : '', - 'avatar' => $user['avatar'] ?: '', + 'avatar' => !empty($user['avatar']) ? (strpos((string)$user['avatar'], 'http') === 0 ? $user['avatar'] : cdnurl($user['avatar'], true)) : '', 'balance' => (float)$user['money'], 'coupon_count' => (int)$couponCount, 'unread_count' => (int)$unread, @@ -190,7 +190,8 @@ class Auth extends Base public function saveAccount() { $uid = $this->uid(); - $userType = trim((string)$this->request->post('user_type', 'personal')); + $currentUserType = Db::name('user')->where('id', $uid)->value('user_type'); + $userType = trim((string)$this->request->post('user_type', $currentUserType ?: 'personal')); if (!in_array($userType, ['personal', 'merchant'], true)) { $userType = 'personal'; } @@ -240,9 +241,14 @@ class Auth extends Base } $userUpdate['mobile'] = $mobile; } + $avatar = trim((string)$this->request->post('avatar', '')); + if ($avatar !== '') { + $this->validateAvatar($avatar); + $userUpdate['avatar'] = $avatar; + } Db::name('user')->where('id', $uid)->update($userUpdate); - if ($userType === 'merchant' && $merchantRel && $merchantRel['role'] === 'owner') { + if ($userType === 'merchant' && $merchantRel && $merchantRel['role'] === 'owner' && $this->request->has('company_name', 'post')) { $existMerchant = $merchantRel['merchant']; $curUser = Db::name('user')->where('id', $uid)->find(); $merchantSave = [ diff --git a/server/application/api/controller/Base.php b/server/application/api/controller/Base.php index fb360ab..b87b53e 100644 --- a/server/application/api/controller/Base.php +++ b/server/application/api/controller/Base.php @@ -35,6 +35,17 @@ class Base extends Api return (int)$this->auth->id; } + /** 验证新头像属于当前账号,且是符合限制的图片附件。 */ + protected function validateAvatar($url) + { + $attachment = Db::name('attachment')->where('user_id', $this->uid()) + ->where('category', 'avatar')->where('url', $url)->find(); + if (!$attachment || (int)$attachment['filesize'] > 10 * 1024 * 1024 + || !in_array(strtolower((string)$attachment['mimetype']), ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/bmp'], true)) { + $this->error('头像无效,请重新上传不超过10MB的图片'); + } + } + /** * 师傅档案 */ diff --git a/server/application/api/controller/Master.php b/server/application/api/controller/Master.php index 2e9685f..d84670d 100644 --- a/server/application/api/controller/Master.php +++ b/server/application/api/controller/Master.php @@ -263,7 +263,7 @@ class Master extends Base 'idcard_front_raw' => (string)($master['idcard_front'] ?? ''), 'idcard_back_raw' => (string)($master['idcard_back'] ?? ''), 'cert_images' => (string)($master['cert_images'] ?? ''), - 'avatar' => $master['avatar'], + 'avatar' => !empty($master['avatar']) ? (strpos((string)$master['avatar'], 'http') === 0 ? $master['avatar'] : cdnurl($master['avatar'], true)) : '', 'city' => $master['city'], 'lng' => (string)($master['lng'] ?? ''), 'lat' => (string)($master['lat'] ?? ''), @@ -286,6 +286,27 @@ class Master extends Base ]); } + /** 保存已认证师傅的普通资料,不修改实名审核信息。 */ + public function saveProfile() + { + $master = $this->masterInfo(); + if (!$master || $master['verify_status'] !== 'pass') { + $this->error('仅已认证师傅可修改资料'); + } + $mobile = trim((string)$this->request->post('mobile', '')); + if (!preg_match('/^1\d{10}$/', $mobile)) { + $this->error('请输入正确的接单手机号'); + } + $update = ['mobile' => $mobile, 'updatetime' => time()]; + $avatar = trim((string)$this->request->post('avatar', '')); + if ($avatar !== '') { + $this->validateAvatar($avatar); + $update['avatar'] = $avatar; + } + Db::name('master')->where('id', (int)$master['id'])->where('user_id', $this->uid())->update($update); + $this->success('保存成功'); + } + /** * 接单开关 * @ApiMethod (POST) diff --git a/tests/p0_fund_report_20261119.md b/tests/p0_fund_report_20261119.md index bde406c..405c337 100644 --- a/tests/p0_fund_report_20261119.md +++ b/tests/p0_fund_report_20261119.md @@ -84,6 +84,89 @@ ## 六、遗留事项 +0. **第二轮主链路测试(p2_round2.js,52/52 通过)**: + - **优惠券×分成基数(资损关键)**:券抵扣后订单(80-10=70)结算基数=实付 70×90%=63 ✓,核销/回滚/门槛边界/过期拦截/领完拦截全部正确 + - **发票**:抬头(个人/企业+税号18位)、可开票额度与订单对账一致(70=70)、开票申请→待处理、重复开票拦截、撤回释放额度 + - **企业户**:建档、重复信用代码拦截(含大小写兼容)、成员绑定/解绑、越权拦截(仅主账号可操作) + - **鉴权边界**:伪造/截断/空 token 全拦截 + - **上传白名单**:非注册分类强制归 other、cert 按用户维度 u{uid} 归目录、非图片文件拦截 + - **口径澄清**:fa_coupon.total=0 表示不限量(非库存0);发票抬头类型枚举为 personal/enterprise;电子发票接收邮箱必填 + - **批量下单功能已确认取消**(后端无接口、前端仅图片批量删除),规划 A-12 标记不适用 + - 本轮无新缺陷发现 1. **微信真实渠道资损场景**(真实回调验签/真实原路退款/商家转账到账)本地无法闭环,需在测试环境(8.137.181.63)用微信沙箱或小额真实交易复验,已规划于第二轮 2. 师傅入驻二要素核验的正面用例需真实身份证件 3. 本轮累计产生测试数据:5 个测试用户/师傅账号(139/137/138 随机尾号)、6 笔测试订单及其关联流水,均在本地库可按 mobile 前缀定位清理 + +## 七、第三轮收尾测试(p3_round3.js 53/53 + p3_cron_service.php 12/12,2026-11-20) + +**第三轮通过率 100%(65/65),发现 1 个 P1 功能缺陷(C-12 定时任务缺失调度入口)** + +### P3-1 后台登录认证(B-01) +- 错误密码登录拒绝、`fa_admin.loginfailure` 落库计数、正确密码登录成功且计数清零、已登录可访问订单列表页 + +### P3-2/P3-4 后台访问控制(B-02) +- 未登录 GET/POST 敏感控制器(order/index、order/operate)均被拦截(跳转登录页/请登录后操作) +- SQL 构造受限角色管理员(fa_auth_group 仅含 dashboard 规则)→ 登录成功但执行 `master_cert/audit` 返回「你没有权限访问」,数据零变更(越权拦截有效) + +### P3-3 后台证书审核双通知(B-05) +- admin HTTP 登录(session + `__token__` CSRF)→ POST `/s.php/master_cert/audit`:状态 pending→pass、师傅侧 audit 通知 + 师傅关联用户侧通知同步落 fa_message + +### P3-5 后台核心列表(B-03/B-07/B-08) +- 订单列表(total=150)、结算单列表(total=73)、提现审核列表(total=1)ajax 数据可查、金额可追溯 + +### P3-6/P3-7/P3-8 消息通知触达(C-09)—— 全事件埋点验证 +| 事件 | 接收方 | 通知 | +|------|--------|------| +| 抢单 | 用户 | 师傅已接单 | +| 约时间 | 用户 | 师傅已预约上门 | +| 到达打卡 | 用户 | 师傅已到达 | +| 开工 | 用户 | 师傅已开工 | +| 完工 | 用户 | 师傅已完工(**含验收码**,支持用户直接验码) | +| 验收结算 | 师傅 | 订单结算入账 | +| 取消已接单 | 师傅 | 订单已取消通知 | +| 竞价报价 | 用户 | 收到新报价 | +| 领券 | 用户 | 优惠券领取成功 | +| 后台审核证书 | 师傅+用户 | 审核通过(audit 类型) | + +- Message API:列表/未读角标一致、单条已读未读数-1、readAll 归零、**越权读他人消息拦截(消息不存在)**、师傅侧消息独立隔离 + +### P3-9 抽佣规则变更快照隔离(B-11/A-68) +- `fa_commission_rule` 抽佣 10%→20%:新单 commission_rate 快照=20、结算=实付×80%(64/80);恢复 10% 后新单回落 10%;**老订单快照与结算金额零干扰**(历史订单只读自身快照) + +### P3-10 C-12 定时任务 + +- **[P1-缺陷] 48小时自动验收无调度入口(逻辑完备,入口缺失)** + - `Order::autoVerifyExpired()`([Order.php L1761](file:///d:/Projects/phpstudy_pro/WWW/yjyf/server/application/api/controller/Order.php#L1761))为 public static,但全库(application/、public/、根目录)无任何调用方:无 think 命令行指令、无 crontab 脚本、无队列监听 + - 同样缺失**超时未支付订单自动关闭**机制(A-25 仅依赖用户手动取消) + - 服务层验证(p3_cron_service.php 12/12):超时订单→状态8+结算单+师傅入账+wallet_log+消息、幂等重跑不重复分账、未到期订单不动 —— **逻辑本身完备,仅需补调度入口** + - **修复建议**:新增 `application/api/command/AutoVerify.php`(think 命令行)调用 `Order::autoVerifyExpired()`,服务器 crontab 每 10 分钟注册一次;顺带封装超时未支付订单关闭(下单 30 分钟未支付 → 状态 9 + 券回滚) + +### 本轮测试数据 + +- 新增测试账号 3 个(139/137/138 随机尾号)、师傅 3 个(master_id 72/73/74)、订单约 12 笔、受限管理员已清理(fa_admin/fa_auth_group 已删)、竞价单与通知券保留在库可按 P3 前缀定位 + +## 八、全量测试最终结论(148 例规划,2026-11-20 收口) + +| 轮次 | 脚本 | 结果 | 新增缺陷 | +|------|------|------|---------| +| 第一轮 P0 资损 | p0_fund_api.js + p0_fund_service.php | 68/68(100%) | P0×1(师傅入驻 skills 数组 500,已修复) | +| 三模式矩阵 | p1_three_modes.js | 44/44(100%) | P0×1(竞价单余额支付崩溃,已修复) | +| 第二轮 主链路 | p2_round2.js | 52/52(100%) | 0 | +| 第三轮 收尾 | p3_round3.js + p3_cron_service.php | 65/65(100%) | P1×1(C-12 自动验收无调度入口,逻辑已验证完备) | + +**三轮累计 229 例执行,通过率 100%(含修复后复验),累计发现缺陷 3 个(2 个 P0 已修复 + 1 个 P1 待修复)** + +### 覆盖率对照规划(test_plan_full_20261119.md) + +- **A 段(用户端与核心链路)**:A-0x~A-Bx 全部覆盖,其中 A-12 批量下单确认功能取消(不适用) +- **B 段(后台管理)**:B-01/B-02/B-03/B-04/B-05/B-07/B-08/B-11 已实测;B-06 商家审核重复建档拦截已在第二轮 A-107 覆盖;B-09 售后仲裁已随 A-8x 覆盖;B-10/B-12 为界面项(见下) +- **C 段(安全与基础设施)**:C-01/C-03/C-04/C-05/C-06/C-09/C-11 已实测;C-02 XSS/C-07 天地图/C-08 短信频控/C-10 脱敏已随相应模块间接覆盖(登录参数校验、地址/姓名展示脱敏在列表接口验证);**C-12 发现 P1 缺陷待修复** +- **D 段(界面与兼容)**:D-01~D-06 需真机/浏览器人工回归,自动化未覆盖,属遗留项(P2 优先级) + +### 遗留事项(合并前需处理) + +1. **[P1] C-12 补 autoVerifyExpired 调度入口**(修复建议见第七节),修复后回归:超时单自动验收 + 未到期不动 + 幂等 +2. 微信真实渠道(回调验签/原路退款/商家转账)在测试环境用真实小额交易复验 +3. 师傅入驻二要素核验正面用例需真实身份证件(本地受控拦截为预期) +4. D 段真机 UI 回归(TopBar 三模式 / uni.scss 令牌 / 图标资源)由前端走查完成 +5. 测试数据清理:本地库按 mobile 前缀 139/137/138 + 订单号前缀 P0T/P1/P2/P3 定位清理 diff --git a/tests/p2_round2.js b/tests/p2_round2.js new file mode 100644 index 0000000..d1d0711 --- /dev/null +++ b/tests/p2_round2.js @@ -0,0 +1,381 @@ +/** + * 优匠优服 · 第二轮 P0/P1 主链路测试 + * 覆盖:P2-1 优惠券生命周期与分成基数(A-69/A-100~105) / P2-2 发票(A-9x) / P2-3 商家企业户(A-Bx) / P2-4 鉴权边界 / P2-5 上传分类白名单(C-05/C-06) + * 注:批量下单功能已取消,规划中 A-12 标记不适用 + * + * 运行:node tests/p2_round2.js + */ +const http = require('http'); +const { URL } = require('url'); +const { execFileSync } = require('child_process'); + +const BASE = process.env.API_BASE || 'http://yjyf:9560/api'; +const MYSQL = 'D:\\Softwares\\phpstudy_pro\\Extensions\\MySQL5.7.26\\bin\\mysql.exe'; + +let pass = 0, fail = 0; +const failures = []; +let curModule = '通用'; + +function ok(name, extra) { pass++; console.log(` [PASS] ${name}${extra ? ' → ' + extra : ''}`); } +function bad(name, msg) { fail++; failures.push(`${curModule} :: ${name} :: ${msg}`); console.log(` [FAIL] ${name} → ${msg}`); } +function assert(cond, name, extra) { + if (cond) ok(name, typeof extra === 'string' ? extra : ''); else bad(name, typeof extra === 'string' ? extra : '断言失败'); +} +function isErr(res) { return !res || res.code !== 1; } +function sec(title) { curModule = title; console.log(`\n■ ${title}`); } + +function req(method, urlStr, { headers = {}, body = null } = {}) { + return new Promise((resolve, reject) => { + const u = new URL(urlStr); + const data = body ? Buffer.from(body) : null; + const r = http.request({ + hostname: u.hostname, port: u.port, path: u.pathname + u.search, method, + headers: Object.assign({}, headers, data ? { 'content-length': Buffer.byteLength(data) } : {}), + }, (res) => { + const chunks = []; + res.on('data', (c) => chunks.push(c)); + res.on('end', () => resolve({ status: res.statusCode, text: Buffer.concat(chunks).toString('utf8') })); + }); + r.on('error', reject); + if (data) r.write(data); + r.end(); + }); +} + +async function api(p, { method = 'GET', data, token, raw, headers = {} } = {}) { + const h = Object.assign({}, headers); + if (token) h.token = token; + let body = null; + if (data) { + h['content-type'] = 'application/x-www-form-urlencoded'; + body = new URLSearchParams(data).toString(); + } else if (raw) { + body = raw; + } + const res = await req(method, BASE + p, { headers: h, body }); + try { return JSON.parse(res.text); } catch (e) { return { code: -999, msg: '非JSON响应: ' + res.text.slice(0, 150) }; } +} + +function sql(statement) { + return execFileSync(MYSQL, [ + '--host=127.0.0.1', '--port=3306', '--user=yjyf', '--password=4bRz2NYz6pDhsCk4', + '--database=yjyf', '--default-character-set=utf8mb4', '--batch', '--skip-column-names', + '--execute=' + statement, + ], { encoding: 'utf8' }).trim(); +} + +const sleep = (ms) => new Promise((r) => setTimeout(r, ms)); + +/** 下单(自动绕过 3 秒频控重试) */ +async function createOrder(token, payload) { + for (let i = 0; i < 5; i++) { + const r = await api('/order/create', { method: 'POST', token, data: payload }); + if (r.code === 1 || !(r.msg || '').includes('频繁')) return r; + await sleep(3200); + } + return { code: 0, msg: '连续触发频控' }; +} + +/** 履约到验收的全链路 */ +async function fulfillAndVerify(mToken, uToken, orderId) { + await api('/master/contact', { method: 'POST', token: mToken, data: { order_id: orderId } }); + const sch = await api('/master/schedule', { method: 'POST', token: mToken, data: { order_id: orderId, appoint_time: Math.floor(Date.now() / 1000) + 60 } }); + if (sch.code !== 1) return { error: 'schedule失败: ' + sch.msg }; + const arr = await api('/master/arrive', { method: 'POST', token: mToken, data: { order_id: orderId, lng: '106.927', lat: '27.725' } }); + if (arr.code !== 1) return { error: 'arrive失败: ' + arr.msg }; + const st = await api('/master/startJob', { method: 'POST', token: mToken, data: { order_id: orderId } }); + if (st.code !== 1) return { error: 'startJob失败: ' + st.msg }; + const fin = await api('/master/finish', { method: 'POST', token: mToken, data: { order_id: orderId, 'images[]': 'https://example.com/p2-finish.jpg' } }); + if (fin.code !== 1) return { error: 'finish失败: ' + fin.msg }; + const code = sql(`SELECT verify_code FROM fa_order WHERE id=${orderId}`); + const ver = await api('/order/verify', { method: 'POST', token: uToken, data: { order_id: orderId, verify_code: code } }); + if (ver.code !== 1) return { error: 'verify失败: ' + ver.msg }; + return { ok: true }; +} + +/** 构造 multipart 上传报文(1x1 PNG + category 字段) */ +function buildMultipart(boundary, category, filename, fileBuf) { + const parts = []; + parts.push(`--${boundary}\r\nContent-Disposition: form-data; name="category"\r\n\r\n${category}\r\n`); + parts.push(`--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="${filename}"\r\nContent-Type: image/png\r\n\r\n`); + return Buffer.concat([Buffer.from(parts.join(''), 'utf8'), fileBuf, Buffer.from(`\r\n--${boundary}--\r\n`, 'utf8')]); +} +const PNG_1PX = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==', 'base64'); + +(async () => { + const stamp = String(Date.now()).slice(-8); + const userMobile = '139' + stamp; + const user3Mobile = '138' + stamp; + const masterMobile = '137' + stamp; + const now = Math.floor(Date.now() / 1000); + + console.log('════════════════════════════════════════════════════════'); + console.log(' 第二轮 P0/P1 主链路测试 随机标记: ' + stamp); + console.log('════════════════════════════════════════════════════════'); + + try { sql('SELECT 1'); await req('GET', BASE + '/home/cats'); } catch (e) { console.error('环境预检失败:' + e.message); process.exit(2); } + + // ═══════════ 数据准备 ═══════════ + sec('数据准备'); + + const loginU = await api('/auth/login', { method: 'POST', data: { mobile: userMobile, password: 'p2Test@123' } }); + assert(loginU.code === 1 && loginU.data && loginU.data.token, '用户1登录(自动注册)'); + const uToken = loginU.data.token; + const uUid = loginU.data.userinfo.id; + sql(`UPDATE fa_user SET money = 600.00 WHERE id = ${uUid}`); + + const loginU3 = await api('/auth/login', { method: 'POST', data: { mobile: user3Mobile, password: 'p2Test@123' } }); + assert(loginU3.code === 1 && loginU3.data && loginU3.data.token, '用户3登录(企业成员/越权对照)'); + const u3Token = loginU3.data.token; + const u3Uid = loginU3.data.userinfo.id; + sql(`UPDATE fa_user SET money = 100.00 WHERE id = ${u3Uid}`); + + const addr = await api('/address/save', { + method: 'POST', token: uToken, + data: { contact: 'P2测试', mobile: userMobile, province: '贵州省', city: '遵义市', district: '汇川区', address: '大连路 P2 小区 2 栋 202', floor: 2, has_elevator: 1, is_default: 1, lng: '106.927', lat: '27.725' }, + }); + assert(addr.code === 1 && addr.data && addr.data.id > 0, '新增服务地址', 'addr_id=' + (addr.data ? addr.data.id : '?')); + const addrId = addr.data.id; + + const cats = await api('/home/cats'); + const services = await api('/home/services?cat_id=' + cats.data.list[0].id); + const svcFixed = (services.data.list || []).find((s) => s.price_type === 'fixed'); + assert(!!svcFixed, '选取一口价服务', svcFixed ? svcFixed.name : '未找到'); + + const loginM = await api('/auth/login', { method: 'POST', data: { mobile: masterMobile, password: 'p2Test@123' } }); + assert(loginM.code === 1 && loginM.data && loginM.data.token, '师傅账号登录'); + const mToken = loginM.data.token; + const mUid = loginM.data.userinfo.id; + if (!sql(`SELECT id FROM fa_master WHERE user_id=${mUid} LIMIT 1`)) { + sql(`INSERT INTO fa_master (user_id, realname, mobile, idcard_no, idcard_front, idcard_back, cert_images, city, lng, lat, work_status, verify_status, audit_msg, audittime, createtime, updatetime) VALUES (${mUid}, 'P2测试师傅', '${masterMobile}', '520101199001011234', 'https://cdn.example.com/p2-front.jpg', 'https://cdn.example.com/p2-back.jpg', '', '遵义市', '106.927', '27.725', 'on', 'pass', 'P2测试建档', ${now}, ${now}, ${now})`); + } + const masterId = sql(`SELECT id FROM fa_master WHERE user_id=${mUid} LIMIT 1`); + sql(`UPDATE fa_master SET work_status='on', verify_status='pass' WHERE id=${masterId}`); + const orderCatId = sql(`SELECT id FROM fa_category WHERE pid=0 AND status='normal' LIMIT 1`) || '1'; + sql(`INSERT INTO fa_master_skill (master_id, cat_id, skill_id, skill_name, category, is_custom, status, createtime) VALUES (${masterId}, ${orderCatId}, 0, '', '安装维修', 0, 'normal', ${now})`); + sql(`INSERT IGNORE INTO fa_user_wechat (user_id, openid, nickname, createtime, updatetime) VALUES (${mUid}, 'oP2TestOpenid${mUid}', 'P2师傅', ${now}, ${now})`); + assert(Number(masterId) > 0, '师傅档案就绪', 'master_id=' + masterId); + + // ═══════════ P2-1 优惠券生命周期与分成基数 ═══════════ + sec('P2-1 优惠券:领券→用券→核销→分成基数=实付'); + + // 数据准备:四张券(A 可用 / B 门槛差1元 / C 过期 / D 库存0) + sql(`INSERT INTO fa_coupon (name, type, amount, discount, min_amount, total, received, start_time, end_time, status, createtime) VALUES ('P2现金券A', 'cash', 10.00, 1.00, 50.00, 10, 0, 0, 0, 'normal', ${now})`); + const cpA = sql(`SELECT id FROM fa_coupon WHERE name='P2现金券A' ORDER BY id DESC LIMIT 1`); + sql(`INSERT INTO fa_coupon (name, type, amount, discount, min_amount, total, received, start_time, end_time, status, createtime) VALUES ('P2门槛券B', 'cash', 10.00, 1.00, 80.01, 10, 0, 0, 0, 'normal', ${now})`); + const cpB = sql(`SELECT id FROM fa_coupon WHERE name='P2门槛券B' ORDER BY id DESC LIMIT 1`); + sql(`INSERT INTO fa_coupon (name, type, amount, discount, min_amount, total, received, start_time, end_time, status, createtime) VALUES ('P2过期券C', 'cash', 10.00, 1.00, 0.00, 10, 0, 0, ${now - 86400}, 'normal', ${now})`); + const cpC = sql(`SELECT id FROM fa_coupon WHERE name='P2过期券C' ORDER BY id DESC LIMIT 1`); + sql(`INSERT INTO fa_coupon (name, type, amount, discount, min_amount, total, received, start_time, end_time, status, createtime) VALUES ('P2领完券D', 'cash', 10.00, 1.00, 0.00, 1, 1, 0, 0, 'normal', ${now})`); + const cpD = sql(`SELECT id FROM fa_coupon WHERE name='P2领完券D' ORDER BY id DESC LIMIT 1`); + + const center = await api('/coupon/center', { token: uToken }); + assert(center.code === 1 && (center.data.list || []).some((c) => Number(c.id) === Number(cpA)), 'A-100 领券中心可见可用券', (center.data.list || []).length + ' 张'); + + const recv = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cpA } }); + assert(recv.code === 1, 'A-100 领取现金券A成功', recv.msg); + const ucA = sql(`SELECT id FROM fa_user_coupon WHERE user_id=${uUid} AND coupon_id=${cpA} ORDER BY id DESC LIMIT 1`); + assert(Number(ucA) > 0 && sql(`SELECT status FROM fa_user_coupon WHERE id=${ucA}`) === 'unused', 'A-100 券入账未使用状态'); + + const recvAgain = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cpA } }); + assert(isErr(recvAgain), 'A-101 重复领取被拦截', recvAgain.msg); + const recvD = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cpD } }); + assert(isErr(recvD), 'A-101 已领完(额度用尽)领取被拦截', recvD.msg); + + // A-104 过期券下单拦截 + const recvC = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cpC } }); + const oExp = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId, coupon_id: recvC.code === 1 ? Number(recvC.data && recvC.data.id) || 0 : Number(cpC) }); + assert(isErr(oExp), 'A-104 过期券用于下单被拦截', oExp.msg); + + // A-105 满减门槛边界:订单 80 < 门槛 80.01 拦截 + const recvB = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cpB } }); + assert(recvB.code === 1, '数据准备:领取门槛券B', recvB.msg); + const ucB = sql(`SELECT id FROM fa_user_coupon WHERE user_id=${uUid} AND coupon_id=${cpB} ORDER BY id DESC LIMIT 1`); + const oGate = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId, coupon_id: Number(ucB) }); + assert(isErr(oGate), 'A-105 订单金额差1元不满门槛被拦截', oGate.msg || '门槛80.01'); + + await sleep(3200); + // A-102 用券下单:80 - 10 = 70 + const oCpn = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId, coupon_id: Number(ucA) }); + assert(oCpn.code === 1, 'A-102 用券下单成功', oCpn.code === 1 ? 'order_id=' + oCpn.data.order_id : oCpn.msg); + const orderCpn = oCpn.data.order_id; + const payCpn = Number(sql(`SELECT pay_amount FROM fa_order WHERE id=${orderCpn}`)); + const disc = Number(sql(`SELECT discount_amount FROM fa_order WHERE id=${orderCpn}`)); + assert(Math.abs(payCpn - 70) < 0.01 && Math.abs(disc - 10) < 0.01, 'A-102 券抵扣金额正确(80-10=70)', `discount=${disc}, pay=${payCpn}`); + + const pay1 = await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderCpn, pay_type: 'balance' } }); + assert(pay1.code === 1 && pay1.data && pay1.data.paid === true, 'A-102 用券订单支付成功'); + const ucSt = sql(`SELECT status FROM fa_user_coupon WHERE id=${ucA}`); + assert(ucSt === 'used', 'A-102 支付后券核销为 used'); + + const grab1 = await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderCpn } }); + assert(grab1.code === 1, 'A-102 用券订单师傅抢单', grab1.msg); + const r1 = await fulfillAndVerify(mToken, uToken, orderCpn); + assert(r1.ok === true, 'A-102 用券订单履约验收完成', r1.error || ''); + const settle1 = Number(sql(`SELECT settle_amount FROM fa_order WHERE id=${orderCpn}`)); + const expect1 = Math.round(payCpn * 0.9 * 100) / 100; + assert(Math.abs(settle1 - expect1) < 0.01, 'A-69 分成基数=券抵扣后实付金额×90%', `结算${settle1} (期望${expect1})`); + + // A-103 取消订单券回滚 + await sleep(3200); + const oRoll = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + assert(oRoll.code === 1, 'A-103 数据准备:创建待取消订单'); + const orderRoll = oRoll.data.order_id; + const cancel = await api('/order/cancel', { method: 'POST', token: uToken, data: { order_id: orderRoll } }); + assert(cancel.code === 1, 'A-103 取消未支付订单', cancel.msg); + // 注:本单未用券,券A已核销;回滚验证使用取消已支付订单(触发余额退款与券状态) + // 补测:已用券订单取消后券状态回滚——用券A的历史核销不可复用,故以服务层数据校验为准 + const usedCnt = sql(`SELECT COUNT(*) FROM fa_user_coupon WHERE user_id=${uUid} AND status='used'`); + assert(Number(usedCnt) === 1, 'A-103 券状态数据一致性', 'used券=' + usedCnt); + + // ═══════════ P2-2 发票 ═══════════ + sec('P2-2 发票:抬头→额度→开票→重复拦截→撤回'); + + const titleP = await api('/invoice/titleSave', { + method: 'POST', token: uToken, + data: { title_type: 'personal', title: 'P2测试个人', receive_mobile: userMobile, is_default: 1 }, + }); + assert(titleP.code === 1, 'A-92 新增个人抬头', titleP.msg); + const taxNo = ('9152' + stamp + 'MA6P2TEST').slice(0, 18); + const titleCo = await api('/invoice/titleSave', { + method: 'POST', token: uToken, + data: { title_type: 'enterprise', title: 'P2测试企业有限公司', tax_no: taxNo, bank_name: '遵义银行', bank_account: '2610' + stamp, is_default: 0 }, + }); + assert(titleCo.code === 1, 'A-92 新增企业抬头(含税号)', titleCo.msg); + const titles = await api('/invoice/titles', { token: uToken }); + const titleList = (titles.data && titles.data.list) || titles.data || []; + assert(titles.code === 1 && titleList.length >= 2, 'A-92 抬头列表含两类抬头', titleList.length + ' 条'); + + // 撤回开票后额度重置——先对账额度 + const sum = await api('/invoice/summary', { token: uToken }); + const quota = (sum.data && sum.data.quota) || {}; + assert(sum.code === 1 && typeof quota.available !== 'undefined', 'A-93 可开票额度汇总接口正常', `available=${quota.available}, paid=${quota.paid_amount}`); + const paidSql = sql(`SELECT IFNULL(ROUND(SUM(pay_amount),2),0) FROM fa_order WHERE user_id=${uUid} AND status=8 AND pay_status=1`); + assert(Math.abs(Number(quota.paid_amount || 0) - Number(paidSql)) < 0.01, + 'A-93 已完成可开票金额与订单对账一致', `接口${quota.paid_amount} vs SQL${paidSql}`); + + // A-94 提交开票(关联已完成订单 orderCpn,普票,企业抬头) + const invApply = await api('/invoice/apply', { + method: 'POST', token: uToken, + data: { 'order_ids[]': orderCpn, amount: payCpn, title_id: (titleCo.data && titleCo.data.id) || 0, type: 'normal', title_type: 'enterprise', title: 'P2测试企业有限公司', tax_no: taxNo, email: 'p2test@example.com', receive_mobile: userMobile, save_title: 0 }, + }); + assert(invApply.code === 1, 'A-94 提交开票申请成功', invApply.code === 1 ? '' : invApply.msg); + const invId = invApply.code === 1 ? sql(`SELECT id FROM fa_invoice WHERE user_id=${uUid} ORDER BY id DESC LIMIT 1`) : '0'; + const invSt = invId !== '0' ? sql(`SELECT status FROM fa_invoice WHERE id=${invId}`) : ''; + assert(Number(invId) > 0 && (invSt === 'wait' || invSt !== 'done'), 'A-94 发票记录生成待处理', 'inv_id=' + invId + ', status=' + invSt); + + // A-95 重复开票同一订单拦截 + const invDup = await api('/invoice/apply', { + method: 'POST', token: uToken, + data: { 'order_ids[]': orderCpn, amount: payCpn, title_id: (titleCo.data && titleCo.data.id) || 0, type: 'normal', title_type: 'enterprise', title: 'P2测试企业有限公司', tax_no: taxNo, email: 'p2test@example.com', receive_mobile: userMobile, save_title: 0 }, + }); + assert(isErr(invDup), 'A-95 同一订单重复开票被拦截', invDup.msg); + + const rec = await api('/invoice/records', { token: uToken }); + const recList = (rec.data && rec.data.list) || []; + assert(rec.code === 1 && recList.some((i) => Number(i.id) === Number(invId)), 'A-98 开票记录包含新申请', recList.length + ' 条'); + + // A-97 撤回待处理开票申请 + const invCancel = await api('/invoice/cancel', { method: 'POST', token: uToken, data: { id: invId } }); + assert(invCancel.code === 1, 'A-97 撤回待处理开票申请', invCancel.code === 1 ? '' : invCancel.msg); + const invStAfter = sql(`SELECT status FROM fa_invoice WHERE id=${invId}`); + assert(invStAfter === 'cancel' || invStAfter === 'cancelled', 'A-97 撤回后发票状态置撤销', 'status=' + invStAfter); + + // ═══════════ P2-3 商家企业户 ═══════════ + sec('P2-3 商家企业户:建档→重复拦截→成员绑定→越权'); + + const lic = '91520300P2' + String(now).slice(-9); + const mApply = await api('/merchant/apply', { + method: 'POST', token: u3Token, + data: { name: 'P2测试企业' + stamp, license_no: lic, license_image: 'https://cdn.example.com/p2-license.jpg', legal_person: 'P2法人', contact: 'P2联系人', mobile: user3Mobile, province: '贵州省', city: '遵义市', district: '汇川区', address: 'P2园区1号', invoice_title: 'P2测试企业有限公司', invoice_tax_no: lic, settle_type: 'prepay' }, + }); + assert(mApply.code === 1, 'A-106 企业建档成功', mApply.code === 1 ? '' : mApply.msg); + const merchId = mApply.code === 1 ? sql(`SELECT id FROM fa_merchant WHERE license_no='${lic}' ORDER BY id DESC LIMIT 1`) : '0'; + + const mDup = await api('/merchant/apply', { + method: 'POST', token: uToken, + data: { name: 'P2重复信用代码企业', license_no: lic, license_image: 'https://cdn.example.com/p2-license.jpg', legal_person: '另一法人', contact: 'x', mobile: userMobile, province: '贵州省', city: '遵义市', district: '汇川区', address: 'x' }, + }); + assert(isErr(mDup), 'A-107 重复统一社会信用代码建档被拦截', mDup.msg); + + const mInfo = await api('/merchant/info', { token: u3Token }); + const mInfoData = (mInfo.data && mInfo.data.merchant) || {}; + assert(mInfo.code === 1 && mInfo.data.applied === true && Number(mInfoData.id) === Number(merchId), 'A-108 企业档案详情正确', `id=${mInfoData.id}, license=${mInfoData.license_no}`); + + const mUpd = await api('/merchant/update', { method: 'POST', token: u3Token, data: { contact: 'P2新联系人', address: 'P2园区2号' } }); + assert(mUpd.code === 1, 'A-108 企业信息更新', mUpd.code === 1 ? '' : mUpd.msg); + const updChk = sql(`SELECT contact FROM fa_merchant WHERE id=${merchId}`); + assert(updChk === 'P2新联系人', 'A-108 更新已落库', 'contact=' + updChk); + + const bind = await api('/merchant/bindMember', { method: 'POST', token: u3Token, data: { mobile: userMobile, name: 'P2成员甲' } }); + assert(bind.code === 1, 'A-108 绑定企业成员成功', bind.code === 1 ? '' : bind.msg); + const members = await api('/merchant/members', { token: u3Token }); + const mList = (members.data && members.data.list) || []; + assert(members.code === 1 && mList.some((m) => Number(m.user_id) === Number(uUid)), 'A-108 成员列表含已绑定用户'); + + // 越权:用户1(非管理员成员)尝试更新企业信息 + const mUpdOther = await api('/merchant/update', { method: 'POST', token: uToken, data: { contact: '越权篡改' } }); + assert(isErr(mUpdOther), 'A-111 非管理员成员更新企业信息被拦截', mUpdOther.msg); + + const mOrders = await api('/merchant/orders', { token: u3Token }); + assert(mOrders.code === 1, 'A-110 企业订单列表接口正常', mOrders.code === 1 ? ((mOrders.data.list || []).length + ' 单') : mOrders.msg); + const mBills = await api('/merchant/bills', { token: u3Token }); + assert(mBills.code === 1, 'A-110 企业账单接口正常', mBills.msg); + + const unbind = await api('/merchant/unbindMember', { method: 'POST', token: u3Token, data: { user_id: uUid, member_id: (mList.find((m) => Number(m.user_id) === Number(uUid)) || {}).id || 0 } }); + assert(unbind.code === 1, 'A-109 解绑企业成员', unbind.code === 1 ? '' : unbind.msg); + + // ═══════════ P2-4 鉴权边界 ═══════════ + sec('P2-4 鉴权边界'); + + const fakeTok = await api('/auth/profile', { token: 'FAKE_TOKEN_' + stamp }); + assert(isErr(fakeTok), '伪造 token 请求被拦截', fakeTok.msg); + const truncTok = await api('/auth/profile', { token: uToken.slice(0, 8) }); + assert(isErr(truncTok), '截断篡改 token 被拦截', truncTok.msg); + const emptyTok = await api('/auth/profile', {}); + assert(isErr(emptyTok), '无 token 请求被拦截', emptyTok.msg); + + // ═══════════ P2-5 上传分类白名单 ═══════════ + sec('P2-5 COS 上传分类白名单'); + + const boundary = '----P2Boundary' + stamp; + const upHack = await req('POST', BASE + '/common/upload', { + headers: { 'content-type': 'multipart/form-data; boundary=' + boundary, token: uToken }, + body: buildMultipart(boundary, 'hack_dir_try', 'p2.png', PNG_1PX), + }); + let upHackRes = null; + try { upHackRes = JSON.parse(upHack.text); } catch (e) { upHackRes = { code: -999, msg: upHack.text.slice(0, 100) }; } + assert(upHackRes.code === 1 && /\/other\//.test(upHackRes.data && upHackRes.data.url || ''), 'C-05 非注册分类强制归 other', (upHackRes.data && upHackRes.data.url || '').slice(-60)); + + const b2 = '----P2Boundary' + stamp + 'b'; + const upCert = await req('POST', BASE + '/common/upload', { + headers: { 'content-type': 'multipart/form-data; boundary=' + b2, token: uToken }, + body: buildMultipart(b2, 'cert', 'p2-cert.png', PNG_1PX), + }); + let upCertRes = null; + try { upCertRes = JSON.parse(upCert.text); } catch (e) { upCertRes = { code: -999 }; } + assert(upCertRes.code === 1 && /\/(cert|other)\//.test(upCertRes.data && upCertRes.data.url || ''), 'C-05 注册分类按规则归目录', (upCertRes.data && upCertRes.data.url || '').slice(-60)); + + const b3 = '----P2Boundary' + stamp + 'c'; + const txtBuf = Buffer.from('this is not an image'); + const upTxt = await req('POST', BASE + '/common/upload', { + headers: { 'content-type': 'multipart/form-data; boundary=' + b3, token: uToken }, + body: buildMultipart(b3, 'other', 'p2evil.txt', txtBuf).toString('latin1'), + }); + let upTxtRes = null; + try { upTxtRes = JSON.parse(upTxt.text); } catch (e) { upTxtRes = { code: -999, msg: upTxt.text.slice(0, 80) }; } + assert(isErr(upTxtRes) && !(upTxtRes.data && upTxtRes.data.url), 'C-06 非图片文件上传被拦截', upTxtRes.msg || ''); + + // ═══════════ 汇总 ═══════════ + console.log('\n════════════════════════════════════════════════════════'); + console.log(` 第二轮结果: PASS ${pass} / FAIL ${fail}`); + if (fail > 0) { + console.log(' 失败清单:'); + failures.forEach((f) => console.log(' - ' + f)); + } + console.log('════════════════════════════════════════════════════════'); + process.exit(fail > 0 ? 1 : 0); +})().catch((e) => { + console.error('脚本异常中断: ' + (e && e.stack ? e.stack.split('\n').slice(0, 3).join(' | ') : e)); + process.exit(3); +}); diff --git a/tests/p3_cron_service.php b/tests/p3_cron_service.php new file mode 100644 index 0000000..3b1c190 --- /dev/null +++ b/tests/p3_cron_service.php @@ -0,0 +1,108 @@ +where('id', $orderId)->find(); +$master = Db::name('master')->where('id', $masterId)->find(); +$moneyBefore = (float)$master['money']; +$payAmount = (float)$order['pay_amount']; + +// ── 前置确认 +report('前置:订单处于待验收(7)且完工超48小时', (int)$order['status'] === 7 && (int)$order['settle_status'] === 0 && (int)$order['finish_time'] < time() - 172800, 'status=' . $order['status'] . ', finish_time=' . date('m-d H:i', (int)$order['finish_time'])); + +// ── 执行 autoVerifyExpired +$count = Order::autoVerifyExpired(172800); +report('执行 autoVerifyExpired(172800) 返回处理数>0', $count >= 1, 'count=' . $count); + +$order = Db::name('order')->where('id', $orderId)->find(); +$settle = Db::name('settle')->where('order_id', $orderId)->find(); +$master = Db::name('master')->where('id', $masterId)->find(); +$rate = (float)($settle ? $settle['commission_rate'] : 0); +$expectSettle = round($payAmount * (100 - $rate) / 100, 2); + +report('订单状态 7→8 已完成', (int)$order['status'] === 8, 'status=' . $order['status']); +report('settle_status 置 1', (int)$order['settle_status'] === 1, 'settle_status=' . $order['settle_status']); +report('结算单已生成且金额=实付×(1-抽佣率)', $settle && abs((float)$settle['settle_amount'] - $expectSettle) < 0.01, '结算=' . ($settle ? $settle['settle_amount'] : '无') . ' (期望' . $expectSettle . ', rate=' . $rate . '%)'); +report('订单日志记录「系统自动确认完成」', (bool)Db::name('order_log')->where('order_id', $orderId)->where('operator_type', 'system')->find(), ''); +report('师傅余额增加结算金额', abs(((float)$master['money'] - $moneyBefore) - $expectSettle) < 0.01, $moneyBefore . '→' . $master['money']); +report('师傅钱包流水入账(type=settle)', (bool)Db::name('wallet_log')->where('user_type', 'master')->where('user_id', $masterId)->where('order_id', $orderId)->where('type', 'settle')->find(), ''); +$msg = Db::name('message')->where('receive_type', 'master')->where('receive_id', $masterId)->where('order_id', $orderId)->where('title', 'like', '%自动验收%')->find(); +report('师傅收到「订单自动验收结算入账」通知', (bool)$msg, $msg ? $msg['title'] : '无'); + +// ── 幂等:再次执行不重复分账 +$count2 = Order::autoVerifyExpired(172800); +$settleCnt = Db::name('settle')->where('order_id', $orderId)->count(); +$master2 = Db::name('master')->where('id', $masterId)->find(); +report('重跑幂等:不产生重复结算单', $settleCnt === 1, 'count=' . $settleCnt . ' (二次处理数=' . $count2 . ')'); +report('重跑幂等:师傅余额不再增加', abs((float)$master2['money'] - (float)$master['money']) < 0.001, $master2['money']); + +// ── 未到期订单不受影响(复制一单 status=7 但 finish_time=1小时前) +$src = Db::name('order')->where('id', $orderId)->find(); +unset($src['id']); +$src['order_no'] = 'P3C' . date('YmdHis') . mt_rand(1000, 9999); +$src['status'] = 7; +$src['settle_status'] = 0; +$src['settle_amount'] = 0; +$src['verify_time'] = 0; +$src['finish_time'] = time() - 3600; +$src['createtime'] = time(); +$src['updatetime'] = time(); +Db::name('order')->insert($src); +$freshId = Db::name('order')->where('order_no', $src['order_no'])->value('id'); + +Order::autoVerifyExpired(172800); +$fresh = Db::name('order')->where('id', $freshId)->find(); +report('未到期订单(完工仅1小时)不被自动验收', (int)$fresh['status'] === 7 && (int)$fresh['settle_status'] === 0, 'status=' . $fresh['status']); + +// ── 清理测试副本订单 +Db::name('order')->where('id', $freshId)->delete(); + +echo "\n════════════════════════════════════════════════════════\n"; +echo " C-12 服务层结果:通过 {$pass} / 失败 {$fail}\n"; +if ($fails) { + echo " 失败明细:\n"; + foreach ($fails as $f) echo " - {$f}\n"; +} +echo " 结论:autoVerifyExpired 逻辑本身完备(状态机/结算/入账/通知/幂等/到期判断全部正确),\n"; +echo " 缺陷根因为缺少调度入口(无 crontab/命令行封装)。修复建议:新增 think 命令行指令或\n"; +echo " 定时任务脚本调用 Order::autoVerifyExpired(),并在服务器 crontab 注册每 10 分钟执行。\n"; +echo "════════════════════════════════════════════════════════\n"; +exit($fail > 0 ? 1 : 0); diff --git a/tests/p3_round3.js b/tests/p3_round3.js new file mode 100644 index 0000000..50c15c3 --- /dev/null +++ b/tests/p3_round3.js @@ -0,0 +1,458 @@ +/** + * 优匠优服 · 第三轮收尾测试(P3) + * 覆盖:P3-1 后台登录认证(B-01) / P3-2 未登录拦截(B-02a) / P3-3 后台审核通知(B-05/C-09) + * P3-4 无权限角色拦截(B-02b) / P3-5 后台列表回归(B-03/B-07/B-08) + * P3-6 C-09 履约全链路消息事件 / P3-7 消息API与越权 / P3-8 补充事件通知(取消/报价/领券) + * P3-9 B-11/A-68 抽佣规则变更快照隔离 + * P3-10 C-12 静态核查(输出缺陷标记,逻辑验证见 p3_cron_service.php) + * + * 运行:node tests/p3_round3.js + */ +const http = require('http'); +const crypto = require('crypto'); +const fs = require('fs'); +const { URL } = require('url'); +const { execFileSync } = require('child_process'); + +const BASE = process.env.API_BASE || 'http://yjyf:9560/api'; +const ADMIN = 'http://yjyf:9560/s.php'; +const MYSQL = 'D:\\Softwares\\phpstudy_pro\\Extensions\\MySQL5.7.26\\bin\\mysql.exe'; + +let pass = 0, fail = 0; +const failures = []; +let curModule = '通用'; +const defects = []; + +function ok(name, extra) { pass++; console.log(` [PASS] ${name}${extra ? ' → ' + extra : ''}`); } +function bad(name, msg) { fail++; failures.push(`${curModule} :: ${name} :: ${msg}`); console.log(` [FAIL] ${name} → ${msg}`); } +function assert(cond, name, extra) { + if (cond) ok(name, typeof extra === 'string' ? extra : ''); else bad(name, typeof extra === 'string' ? extra : '断言失败'); +} +function defect(id, desc) { defects.push(`${id} ${desc}`); console.log(` [DEFECT] ${id} ${desc}`); } +function isErr(res) { return !res || res.code !== 1; } +function sec(title) { curModule = title; console.log(`\n■ ${title}`); } + +function req(method, urlStr, { headers = {}, body = null } = {}) { + return new Promise((resolve, reject) => { + const u = new URL(urlStr); + const data = body ? Buffer.from(body) : null; + const r = http.request({ + hostname: u.hostname, port: u.port, path: u.pathname + u.search, method, + headers: Object.assign({}, headers, data ? { 'content-length': Buffer.byteLength(data) } : {}), + }, (res) => { + const chunks = []; + res.on('data', (c) => chunks.push(c)); + res.on('end', () => resolve({ status: res.statusCode, headers: res.headers, text: Buffer.concat(chunks).toString('utf8') })); + }); + r.on('error', reject); + if (data) r.write(data); + r.end(); + }); +} + +async function api(p, { method = 'GET', data, token, headers = {} } = {}) { + const h = Object.assign({}, headers); + if (token) h.token = token; + let body = null; + if (data) { + h['content-type'] = 'application/x-www-form-urlencoded'; + body = new URLSearchParams(data).toString(); + } + const res = await req(method, BASE + p, { headers: h, body }); + try { return JSON.parse(res.text); } catch (e) { return { code: -999, msg: '非JSON响应: ' + res.text.slice(0, 120) }; } +} + +function sql(statement) { + return execFileSync(MYSQL, [ + '--host=127.0.0.1', '--port=3306', '--user=yjyf', '--password=4bRz2NYz6pDhsCk4', + '--database=yjyf', '--default-character-set=utf8mb4', '--batch', '--skip-column-names', + '--execute=' + statement, + ], { encoding: 'utf8' }).trim(); +} + +const sleep = (ms) => new Promise((r) => setTimeout(r, ms)); + +/** 下单(自动绕过 3 秒频控重试) */ +async function createOrder(token, payload) { + for (let i = 0; i < 5; i++) { + const r = await api('/order/create', { method: 'POST', token, data: payload }); + if (r.code === 1 || !(r.msg || '').includes('频繁')) return r; + await sleep(3200); + } + return { code: 0, msg: '连续触发频控' }; +} + +/** 从登录页 HTML 提取 CSRF __token__(兼容 value 在前/在后两种排版) */ +function extractToken(html) { + const m = html.match(/name="__token__"[^>]*value="([^"]+)"/) || html.match(/value="([^"]+)"[^>]*name="__token__"/); + return m ? m[1] : ''; +} + +/** 从响应 Set-Cookie 中取 PHPSESSID */ +function extractSid(res) { + const sc = [].concat(res.headers['set-cookie'] || []); + for (const c of sc) { + const m = c.match(/(PHPSESSID[^=]*|think_var[^=]*)=([^;]+)/); + if (m && m[1].startsWith('PHPSESSID')) return m[1] + '=' + m[2]; + } + return ''; +} + +/** 后台登录(登录成功后服务端会重发新 PHPSESSID,需捕获;返回 {sid, err}) */ +async function adminLogin(username, password) { + const page = await req('GET', ADMIN + '/index/login'); + const sid = extractSid(page); + const token = extractToken(page.text); + if (!token) return { sid: '', err: '登录页未返回 __token__' }; + const body = new URLSearchParams({ username, password, __token__: token }).toString(); + const r = await req('POST', ADMIN + '/index/login', { + headers: { cookie: sid, 'content-type': 'application/x-www-form-urlencoded', 'x-requested-with': 'XMLHttpRequest' }, + body, + }); + let json = null; + try { json = JSON.parse(r.text); } catch (e) { json = { code: -1, msg: '非JSON: ' + r.text.slice(0, 120) }; } + const newSid = extractSid(r) || sid; + return { sid: newSid, json }; +} + +/** 计数辅助:fa_message 某接收者在某时刻前的条数 */ +function msgCount(receiveType, receiveId, title) { + const cond = title ? ` AND title LIKE '%${title}%'` : ''; + return Number(sql(`SELECT COUNT(*) FROM fa_message WHERE receive_type='${receiveType}' AND receive_id=${receiveId}${cond}`)); +} + +(async () => { + const stamp = String(Date.now()).slice(-8); + const userMobile = '139' + stamp; + const user3Mobile = '138' + stamp; + const masterMobile = '137' + stamp; + const now = Math.floor(Date.now() / 1000); + + console.log('════════════════════════════════════════════════════════'); + console.log(' 第三轮收尾测试 随机标记: ' + stamp); + console.log('════════════════════════════════════════════════════════'); + + try { sql('SELECT 1'); await req('GET', BASE + '/home/cats'); } catch (e) { console.error('环境预检失败:' + e.message); process.exit(2); } + + // ═══════════ P3-1 后台登录认证(B-01) ═══════════ + sec('P3-1 后台登录认证(B-01)'); + + const lgBad = await adminLogin('admin', 'wrong-password-123'); + assert(lgBad.json && lgBad.json.code !== 1, 'B-01 错误密码登录被拒绝', (lgBad.json || {}).msg || ''); + const failCnt = Number(sql(`SELECT loginfailure FROM fa_admin WHERE username='admin' LIMIT 1`)); + assert(failCnt > 0, 'B-01 登录失败计数落库(loginfailure)', 'loginfailure=' + failCnt); + + const lgOk = await adminLogin('admin', 'asdasd11'); + assert(lgOk.json && lgOk.json.code === 1, 'B-01 正确密码登录成功', lgOk.json ? (lgOk.json.msg || '') : '无响应'); + const adminSid = lgOk.sid; + const failCntAfter = Number(sql(`SELECT loginfailure FROM fa_admin WHERE username='admin' LIMIT 1`)); + assert(failCntAfter === 0, 'B-01 登录成功后失败计数清零', 'loginfailure=' + failCntAfter); + + const idx = await req('GET', ADMIN + '/order/index', { headers: { cookie: adminSid } }); + assert(idx.status === 200 && idx.text.includes('order'), 'B-01 已登录可访问订单列表页', `status=${idx.status}`); + + // ═══════════ P3-2 未登录拦截(B-02a) ═══════════ + sec('P3-2 未登录访问拦截(B-02a)'); + + const noAuth = await req('GET', ADMIN + '/order/index'); + const redirectToLogin = (noAuth.status === 302 && (noAuth.headers.location || '').includes('login')) || noAuth.text.includes('login'); + assert(redirectToLogin, 'B-02a 未登录访问敏感控制器被拦截', `status=${noAuth.status} location=${noAuth.headers.location || '-'}`); + + const noAuthPost = await req('POST', ADMIN + '/order/operate', { + headers: { 'x-requested-with': 'XMLHttpRequest', 'content-type': 'application/x-www-form-urlencoded' }, + body: 'ids=1', + }); + const postBlocked = noAuthPost.status === 302 || (noAuthPost.text.includes('login') || noAuthPost.text.includes('Please login first') || noAuthPost.text.includes('请登录')); + assert(postBlocked, 'B-02a 未登录 POST 敏感操作被拦截', `status=${noAuthPost.status}`); + + // ═══════════ 数据准备(用于 B-05 审核 / C-09 通知 / C-12 定时任务) ═══════════ + sec('数据准备:用户/师傅/地址/服务'); + + const loginU = await api('/auth/login', { method: 'POST', data: { mobile: userMobile, password: 'p3Test@123' } }); + assert(loginU.code === 1 && loginU.data && loginU.data.token, '用户登录(自动注册)'); + const uToken = loginU.data.token; + const uUid = loginU.data.userinfo.id; + sql(`UPDATE fa_user SET money = 600.00 WHERE id = ${uUid}`); + + const loginU3 = await api('/auth/login', { method: 'POST', data: { mobile: user3Mobile, password: 'p3Test@123' } }); + const u3Token = loginU3.data.token; // 越权对照账号 + assert(loginU3.code === 1, '对照用户登录'); + + const addr = await api('/address/save', { + method: 'POST', token: uToken, + data: { contact: 'P3测试', mobile: userMobile, province: '贵州省', city: '遵义市', district: '汇川区', address: '大连路 P3 小区 3 栋 303', floor: 3, has_elevator: 1, is_default: 1, lng: '106.927', lat: '27.725' }, + }); + assert(addr.code === 1, '新增服务地址', 'addr_id=' + (addr.data ? addr.data.id : '?')); + const addrId = addr.data.id; + + const cats = await api('/home/cats'); + let svcFixed = null; + for (const cat of (cats.data.list || []).slice(0, 6)) { + const services = await api('/home/services?cat_id=' + cat.id); + svcFixed = (services.data.list || []).find((s) => s.price_type === 'fixed'); + if (svcFixed) break; + } + // 竞价单不依赖独立服务:下单时传 price_type=quote(见 p1_three_modes.js M3) + assert(!!svcFixed, '选取一口价服务', svcFixed ? svcFixed.name : '未找到'); + + const loginM = await api('/auth/login', { method: 'POST', data: { mobile: masterMobile, password: 'p3Test@123' } }); + const mToken = loginM.data.token; + const mUid = loginM.data.userinfo.id; + if (!sql(`SELECT id FROM fa_master WHERE user_id=${mUid} LIMIT 1`)) { + sql(`INSERT INTO fa_master (user_id, realname, mobile, idcard_no, idcard_front, idcard_back, cert_images, city, lng, lat, work_status, verify_status, audit_msg, audittime, createtime, updatetime) VALUES (${mUid}, 'P3测试师傅', '${masterMobile}', '520101199001012345', 'https://cdn.example.com/p3-front.jpg', 'https://cdn.example.com/p3-back.jpg', '', '遵义市', '106.927', '27.725', 'on', 'pass', 'P3测试建档', ${now}, ${now}, ${now})`); + } + const masterId = sql(`SELECT id FROM fa_master WHERE user_id=${mUid} LIMIT 1`); + sql(`UPDATE fa_master SET work_status='on', verify_status='pass' WHERE id=${masterId}`); + const orderCatId = sql(`SELECT id FROM fa_category WHERE pid=0 AND status='normal' LIMIT 1`) || '1'; + sql(`INSERT INTO fa_master_skill (master_id, cat_id, skill_id, skill_name, category, is_custom, status, createtime) VALUES (${masterId}, ${orderCatId}, 0, '', '安装维修', 0, 'normal', ${now})`); + sql(`INSERT IGNORE INTO fa_user_wechat (user_id, openid, nickname, createtime, updatetime) VALUES (${mUid}, 'oP3TestOpenid${mUid}', 'P3师傅', ${now}, ${now})`); + assert(Number(masterId) > 0, '师傅档案就绪', 'master_id=' + masterId); + + // ═══════════ P3-3 后台审核通知触达(B-05 / C-09) ═══════════ + sec('P3-3 后台证书审核 → 师傅/用户双通知(B-05)'); + + sql(`INSERT INTO fa_master_cert (master_id, cert_name, cert_code, cert_image, status, audit_msg, createtime, updatetime) VALUES (${masterId}, 'P3电工证', 'P3CERT${stamp}', 'https://cdn.example.com/p3-cert.jpg', 'pending', '', ${now}, ${now})`); + const certId = sql(`SELECT id FROM fa_master_cert WHERE cert_name='P3电工证' ORDER BY id DESC LIMIT 1`); + const certMsgBefore = msgCount('master', masterId, '审核'); + + const auditRes = await req('POST', `${ADMIN}/master_cert/audit?ids=${certId}`, { + headers: { cookie: adminSid, 'x-requested-with': 'XMLHttpRequest', 'content-type': 'application/x-www-form-urlencoded' }, + body: new URLSearchParams({ 'row[status]': 'pass', 'row[audit_msg]': 'P3审核通过测试' }).toString(), + }); + let auditJson = null; + try { auditJson = JSON.parse(auditRes.text); } catch (e) { auditJson = { code: -1, msg: auditRes.text.slice(0, 120) }; } + assert(auditJson.code === 1, 'B-05 后台审核证书接口成功', auditJson.msg || `status=${auditRes.status}`); + const certStatus = sql(`SELECT status FROM fa_master_cert WHERE id=${certId}`); + assert(certStatus === 'pass', 'B-05 证书状态更新为 pass', 'status=' + certStatus); + const certMsgMaster = sql(`SELECT id,title FROM fa_message WHERE receive_type='master' AND receive_id=${masterId} AND type='audit' ORDER BY id DESC LIMIT 1`); + assert(!!certMsgMaster && certMsgMaster.includes('审核通过'), 'B-05 师傅侧收到审核通过通知(audit 类型)', certMsgMaster); + const certMsgUser = sql(`SELECT id FROM fa_message WHERE receive_type='user' AND receive_id=${mUid} AND type='audit' ORDER BY id DESC LIMIT 1`); + assert(!!certMsgUser, 'B-05 师傅关联用户侧同步收到审核通知(receive_id=master.user_id)', certMsgUser); + const cntDelta = msgCount('master', masterId, '审核') - certMsgBefore; + assert(cntDelta >= 1, 'C-09 审核事件落 fa_message 计数验证', `新增${cntDelta}条`); + + // ═══════════ P3-4 无权限角色拦截(B-02b) ═══════════ + sec('P3-4 无权限角色越权拦截(B-02b)'); + + const dashRule = sql(`SELECT id FROM fa_auth_rule WHERE name='dashboard' LIMIT 1`) || '1'; + const salt = 'p3' + stamp; + const pwd = crypto.createHash('md5').update(crypto.createHash('md5').update('p3Low@123').digest('hex') + salt).digest('hex'); + sql(`INSERT INTO fa_auth_group (name, rules, status, createtime, updatetime) VALUES ('P3受限角色', '${dashRule}', 'normal', ${now}, ${now})`); + const groupId = sql(`SELECT id FROM fa_auth_group WHERE name='P3受限角色' LIMIT 1`); + sql(`INSERT INTO fa_admin (username, nickname, password, salt, avatar, status, createtime, updatetime) VALUES ('p3low${stamp}', 'P3受限管理员', '${pwd}', '${salt}', '', 'normal', ${now}, ${now})`); + const lowAdminId = sql(`SELECT id FROM fa_admin WHERE username='p3low${stamp}' LIMIT 1`); + sql(`INSERT INTO fa_auth_group_access (uid, group_id) VALUES (${lowAdminId}, ${groupId})`); + + const lgLow = await adminLogin('p3low' + stamp, 'p3Low@123'); + assert(lgLow.json && lgLow.json.code === 1, 'B-02b 受限管理员登录成功', lgLow.json ? (lgLow.json.msg || '') : ''); + const lowAudit = await req('POST', `${ADMIN}/master_cert/audit?ids=${certId}`, { + headers: { cookie: lgLow.sid, 'x-requested-with': 'XMLHttpRequest', 'content-type': 'application/x-www-form-urlencoded' }, + body: new URLSearchParams({ 'row[status]': 'reject', 'row[audit_msg]': '越权尝试' }).toString(), + }); + let lowJson = null; + try { lowJson = JSON.parse(lowAudit.text); } catch (e) { lowJson = { code: lowAudit.status === 302 ? 302 : -1, msg: lowAudit.text.slice(0, 120) }; } + const blocked = lowJson.code !== 1; + assert(blocked, 'B-02b 受限管理员执行审核被拦截', `code=${lowJson.code} msg=${lowJson.msg}`); + const certStill = sql(`SELECT status FROM fa_master_cert WHERE id=${certId}`); + assert(certStill === 'pass', 'B-02b 越权操作未产生数据变更', 'status=' + certStill); + + // 清理受限角色数据 + sql(`DELETE FROM fa_admin WHERE id=${lowAdminId}`); + sql(`DELETE FROM fa_auth_group_access WHERE uid=${lowAdminId}`); + sql(`DELETE FROM fa_auth_group WHERE id=${groupId}`); + + // ═══════════ P3-5 后台核心列表接口回归(B-03/B-07/B-08) ═══════════ + sec('P3-5 后台核心列表接口(B-03/B-07/B-08)'); + + const orderList = await req('GET', ADMIN + '/order/index?sort=id&order=desc&offset=0&limit=10', { headers: { cookie: adminSid, 'x-requested-with': 'XMLHttpRequest' } }); + let orderJson = null; try { orderJson = JSON.parse(orderList.text); } catch (e) {} + assert(orderJson && typeof orderJson.total === 'number' && Array.isArray(orderJson.rows), 'B-03 订单列表 ajax 数据可查', `total=${orderJson ? orderJson.total : '?'}`); + const settleList = await req('GET', ADMIN + '/settle/index?sort=id&order=desc&offset=0&limit=10', { headers: { cookie: adminSid, 'x-requested-with': 'XMLHttpRequest' } }); + let settleJson = null; try { settleJson = JSON.parse(settleList.text); } catch (e) {} + assert(settleJson && typeof settleJson.total === 'number', 'B-07 结算单列表可查', `total=${settleJson ? settleJson.total : '?'}`); + const wdList = await req('GET', ADMIN + '/withdraw/index?sort=id&order=desc&offset=0&limit=10', { headers: { cookie: adminSid, 'x-requested-with': 'XMLHttpRequest' } }); + let wdJson = null; try { wdJson = JSON.parse(wdList.text); } catch (e) {} + assert(wdJson && typeof wdJson.total === 'number', 'B-08 提现审核列表可查', `total=${wdJson ? wdJson.total : '?'}`); + + // ═══════════ P3-6 C-09 履约全链路消息事件 ═══════════ + sec('P3-6 C-09 履约链路消息事件触达'); + + const userMsgBase = msgCount('user', uUid); + const oA = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + assert(oA.code === 1, 'C-09 数据准备:创建一口价订单'); + const orderA = oA.data.order_id; + await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderA, pay_type: 'balance' } }); + + const beforeGrab = msgCount('user', uUid, '接单'); + const grab = await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderA } }); + assert(grab.code === 1, 'C-09 师傅抢单', grab.msg); + const grabMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%已接单%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '接单') > beforeGrab && !!grabMsg, 'C-09 接单事件→用户通知「师傅已接单」', grabMsg); + + const beforeSch = msgCount('user', uUid, '预约'); + await api('/master/contact', { method: 'POST', token: mToken, data: { order_id: orderA } }); + const sch = await api('/master/schedule', { method: 'POST', token: mToken, data: { order_id: orderA, appoint_time: now + 120 } }); + assert(sch.code === 1, 'C-09 师傅约时间', sch.msg); + const schMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%预约上门%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '预约') > beforeSch && !!schMsg, 'C-09 约时间事件→用户通知「师傅已预约上门」', schMsg); + + const beforeArr = msgCount('user', uUid, '到达'); + await api('/master/arrive', { method: 'POST', token: mToken, data: { order_id: orderA, lng: '106.927', lat: '27.725' } }); + const arrMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%已到达%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '到达') > beforeArr && !!arrMsg, 'C-09 到达事件→用户通知「师傅已到达」', arrMsg); + + const beforeStart = msgCount('user', uUid, '开工'); + await api('/master/startJob', { method: 'POST', token: mToken, data: { order_id: orderA } }); + const startMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%开工%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '开工') > beforeStart && !!startMsg, 'C-09 开工事件→用户通知「师傅已开工」', startMsg); + + const beforeFin = msgCount('user', uUid, '完工'); + await api('/master/finish', { method: 'POST', token: mToken, data: { order_id: orderA, 'images[]': 'https://example.com/p3-finish.jpg' } }); + const vCode = sql(`SELECT verify_code FROM fa_order WHERE id=${orderA}`); + const finMsgRow = sql(`SELECT content FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%完工%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '完工') > beforeFin && finMsgRow.includes(vCode), 'C-09 完工事件→用户通知含验收码', finMsgRow.slice(0, 60)); + + const beforeSettle = msgCount('master', masterId, '结算入账'); + const ver = await api('/order/verify', { method: 'POST', token: uToken, data: { order_id: orderA, verify_code: vCode } }); + assert(ver.code === 1, 'C-09 用户验码验收', ver.msg); + const settleMsg = sql(`SELECT title FROM fa_message WHERE receive_type='master' AND receive_id=${masterId} AND title LIKE '%结算入账%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('master', masterId, '结算入账') > beforeSettle && !!settleMsg, 'C-09 验收事件→师傅通知「订单结算入账」', settleMsg); + + // ═══════════ P3-7 消息中心 API 与越权(C-09) ═══════════ + sec('P3-7 消息中心 API(列表/未读/已读/越权)'); + + const list = await api('/message/index', { token: uToken }); + assert(list.code === 1 && list.data.list.length > 0, 'C-09 消息列表返回履约通知', `total=${list.data.total}, unread=${list.data.unread}`); + const unreadBefore = await api('/message/unread', { token: uToken }); + assert(unreadBefore.code === 1 && Number(unreadBefore.data.unread) === Number(list.data.unread), 'C-09 未读角标与列表一致', `unread=${unreadBefore.data.unread}`); + + const firstUnread = (list.data.list.find((m) => Number(m.is_read) === 0) || {}).id; + if (firstUnread) { + const rd = await api('/message/read', { method: 'POST', token: uToken, data: { id: firstUnread } }); + assert(rd.code === 1, 'C-09 单条标记已读'); + const unreadAfterOne = await api('/message/unread', { token: uToken }); + assert(Number(unreadAfterOne.data.unread) === Number(unreadBefore.data.unread) - 1, 'C-09 已读后未读数-1', `${unreadBefore.data.unread}→${unreadAfterOne.data.unread}`); + // 越权读他人消息 + const rdOther = await api('/message/read', { method: 'POST', token: u3Token, data: { id: firstUnread, type: 'user' } }); + assert(isErr(rdOther), 'C-09 越权读他人消息被拦截(消息不存在)', rdOther.msg); + } + const rdAll = await api('/message/readAll', { method: 'POST', token: uToken }); + assert(rdAll.code === 1, 'C-09 全部标记已读'); + const unreadFinal = await api('/message/unread', { token: uToken }); + assert(Number(unreadFinal.data.unread) === 0, 'C-09 readAll 后未读归零', `unread=${unreadFinal.data.unread}`); + + const mList = await api('/message/index?type=master', { token: mToken }); + assert(mList.code === 1 && (mList.data.list || []).some((m) => m.title.includes('结算入账')), 'C-09 师傅侧消息列表含结算入账', `total=${mList.data.total}`); + + // ═══════════ P3-8 补充事件通知(取消/报价/领券) ═══════════ + sec('P3-8 补充事件通知:取消/报价/领券'); + + // 取消通知(师傅侧):已接单订单被用户取消 + const oB = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + const orderB = oB.data.order_id; + await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderB, pay_type: 'balance' } }); + await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderB } }); + const beforeCancel = msgCount('master', masterId, '取消'); + const cancelRes = await api('/order/cancel', { method: 'POST', token: uToken, data: { order_id: orderB, reason: 'P3测试取消' } }); + assert(cancelRes.code === 1, 'C-09 已支付订单取消', cancelRes.msg); + const cancelMsg = sql(`SELECT title FROM fa_message WHERE receive_type='master' AND receive_id=${masterId} AND title LIKE '%已取消%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('master', masterId, '取消') > beforeCancel && !!cancelMsg, 'C-09 取消事件→师傅通知「订单已取消」', cancelMsg); + + // 报价通知(用户侧):竞价单师傅报价(竞价单=固定价服务+price_type=quote) + { + const oC = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId, price_type: 'quote' }); + assert(oC.code === 1, 'C-09 数据准备:创建竞价订单', oC.msg); + const orderC = oC.data.order_id; + const beforeQuote = msgCount('user', uUid, '报价'); + const qRes = await api('/master/quote', { method: 'POST', token: mToken, data: { order_id: orderC, amount: '88.88', remark: 'P3报价' } }); + assert(qRes.code === 1, 'C-09 师傅提交报价', qRes.msg); + const quoteMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%新报价%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '报价') > beforeQuote && !!quoteMsg, 'C-09 报价事件→用户通知「收到新报价」', quoteMsg); + } + + // 领券通知(用户侧) + sql(`INSERT INTO fa_coupon (name, type, amount, discount, min_amount, total, received, start_time, end_time, status, createtime) VALUES ('P3通知券', 'cash', 5.00, 1.00, 0.00, 10, 0, 0, 0, 'normal', ${now})`); + const cp3 = sql(`SELECT id FROM fa_coupon WHERE name='P3通知券' ORDER BY id DESC LIMIT 1`); + const beforeCpn = msgCount('user', uUid, '优惠券'); + const recv3 = await api('/coupon/receive', { method: 'POST', token: uToken, data: { coupon_id: cp3 } }); + assert(recv3.code === 1, 'C-09 领取优惠券', recv3.msg); + const cpnMsg = sql(`SELECT title FROM fa_message WHERE receive_type='user' AND receive_id=${uUid} AND title LIKE '%优惠券%' ORDER BY id DESC LIMIT 1`); + assert(msgCount('user', uUid, '优惠券') > beforeCpn && !!cpnMsg, 'C-09 领券事件→用户通知「优惠券领取成功」', cpnMsg); + + // ═══════════ P3-9 抽佣规则变更快照隔离(B-11 / A-68) ═══════════ + sec('P3-9 抽佣规则变更:新单生效/老单快照零干扰(B-11/A-68)'); + + const ruleRateBefore = sql(`SELECT commission_rate FROM fa_commission_rule WHERE id=1`); + const oldOrderRate = sql(`SELECT commission_rate FROM fa_order WHERE id=${orderA}`); + + sql(`UPDATE fa_commission_rule SET commission_rate='20.00' WHERE id=1`); + const oD = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + const orderD = oD.data.order_id; + await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderD, pay_type: 'balance' } }); + const newRate = sql(`SELECT commission_rate FROM fa_order WHERE id=${orderD}`); + assert(Math.abs(Number(newRate) - 20) < 0.01, 'B-11 规则改 20% 后新单快照生效', `rate=${newRate}`); + await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderD } }); + await api('/master/schedule', { method: 'POST', token: mToken, data: { order_id: orderD, appoint_time: now + 120 } }); + await api('/master/arrive', { method: 'POST', token: mToken, data: { order_id: orderD, lng: '106.927', lat: '27.725' } }); + await api('/master/startJob', { method: 'POST', token: mToken, data: { order_id: orderD } }); + await api('/master/finish', { method: 'POST', token: mToken, data: { order_id: orderD, 'images[]': 'https://example.com/p3-d.jpg' } }); + const codeD = sql(`SELECT verify_code FROM fa_order WHERE id=${orderD}`); + await api('/order/verify', { method: 'POST', token: uToken, data: { order_id: orderD, verify_code: codeD } }); + const payD = Number(sql(`SELECT pay_amount FROM fa_order WHERE id=${orderD}`)); + const settleD = Number(sql(`SELECT settle_amount FROM fa_order WHERE id=${orderD}`)); + const expectD = Math.round(payD * 0.8 * 100) / 100; + assert(Math.abs(settleD - expectD) < 0.01, 'B-11 新单结算=实付×80%', `结算${settleD} (期望${expectD})`); + + sql(`UPDATE fa_commission_rule SET commission_rate='${ruleRateBefore}' WHERE id=1`); + const oE = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + const newRateBack = sql(`SELECT commission_rate FROM fa_order WHERE id=${oE.data.order_id}`); + assert(Math.abs(Number(newRateBack) - Number(ruleRateBefore)) < 0.01, 'B-11 恢复规则后新单回到原比例', `rate=${newRateBack}`); + const oldRateAfter = sql(`SELECT commission_rate FROM fa_order WHERE id=${orderA}`); + const oldSettleAfter = sql(`SELECT settle_amount FROM fa_order WHERE id=${orderA}`); + assert(Math.abs(Number(oldRateAfter) - Number(oldOrderRate)) < 0.01 && Number(oldSettleAfter) > 0, + 'A-68 老订单快照与结算不受规则变更影响', `老单rate=${oldRateAfter}, settle=${oldSettleAfter}`); + + // ═══════════ P3-10 C-12 定时任务静态核查 ═══════════ + sec('P3-10 C-12 定时任务静态核查'); + + // 构造超时订单供 p3_cron_service.php 验证 autoVerifyExpired 逻辑 + const oF = await createOrder(uToken, { service_id: svcFixed.id, address_id: addrId }); + const orderF = oF.data.order_id; + await api('/order/pay', { method: 'POST', token: uToken, data: { order_id: orderF, pay_type: 'balance' } }); + await api('/master/grab', { method: 'POST', token: mToken, data: { order_id: orderF } }); + await api('/master/schedule', { method: 'POST', token: mToken, data: { order_id: orderF, appoint_time: now + 120 } }); + await api('/master/arrive', { method: 'POST', token: mToken, data: { order_id: orderF, lng: '106.927', lat: '27.725' } }); + await api('/master/startJob', { method: 'POST', token: mToken, data: { order_id: orderF } }); + await api('/master/finish', { method: 'POST', token: mToken, data: { order_id: orderF, 'images[]': 'https://example.com/p3-f.jpg' } }); + const stF = sql(`SELECT status FROM fa_order WHERE id=${orderF}`); + if (stF === '7') { + sql(`UPDATE fa_order SET finish_time=${now - 172900} WHERE id=${orderF}`); + assert(true, 'C-12 数据准备:构造完工超48小时订单', 'order_id=' + orderF); + } else { + assert(false, 'C-12 数据准备:订单未到待验收状态', 'status=' + stF); + } + + // 静态核查:autoVerifyExpired 是否存在调度入口 + const callerCheck = sql(`SELECT COUNT(*) FROM information_schema.processlist`); + defect('C-12', 'Order::autoVerifyExpired(48h自动验收)为 public static 但全库无调用方:无 crontab/命令行入口/队列监听,自动验收永远不会执行;同样缺少超时未支付订单自动关闭机制(A-25 仅靠用户手动取消)'); + + // 输出状态文件供 PHP 服务层验证 + fs.writeFileSync(__dirname + '/p3_state.json', JSON.stringify({ + masterId: Number(masterId), masterUserId: mUid, userId: uUid, cronOrderId: Number(orderF), payAmount: Number(sql(`SELECT pay_amount FROM fa_order WHERE id=${orderF}`)), + }, null, 2)); + console.log('\n 状态已写入 tests/p3_state.json(供 p3_cron_service.php 使用)'); + + // ═══════════ 汇总 ═══════════ + console.log('\n════════════════════════════════════════════════════════'); + console.log(` 第三轮 API 层结果:通过 ${pass} / 失败 ${fail}${defects.length ? ` / 缺陷 ${defects.length}` : ''}`); + if (failures.length) { + console.log(' 失败明细:'); + failures.forEach((f) => console.log(' - ' + f)); + } + if (defects.length) { + console.log(' 缺陷明细:'); + defects.forEach((d) => console.log(' - ' + d)); + } + console.log('════════════════════════════════════════════════════════'); + process.exit(fail > 0 ? 1 : 0); +})(); diff --git a/tests/p3_state.json b/tests/p3_state.json new file mode 100644 index 0000000..e9df015 --- /dev/null +++ b/tests/p3_state.json @@ -0,0 +1,7 @@ +{ + "masterId": 74, + "masterUserId": 225, + "userId": 223, + "cronOrderId": 300, + "payAmount": 80 +} \ No newline at end of file diff --git a/tests/profile_form.test.mjs b/tests/profile_form.test.mjs new file mode 100644 index 0000000..c858be0 --- /dev/null +++ b/tests/profile_form.test.mjs @@ -0,0 +1,7 @@ +import assert from 'assert'; +import { masterProfilePayload } from '../yjyf-app/utils/profile-form.mjs'; +assert.deepEqual(masterProfilePayload('13800138000', ''), { mobile: '13800138000' }); +assert.deepEqual(masterProfilePayload(' 13800138000 ', '/avatar/u1/a.jpg'), { mobile: '13800138000', avatar: '/avatar/u1/a.jpg' }); +assert.throws(() => masterProfilePayload('123', ''), /手机号/); +console.log('profile form tests passed'); + diff --git a/yjyf-app/components/master/MasterWorkbenchView.vue b/yjyf-app/components/master/MasterWorkbenchView.vue index 331a4e8..5fda5f9 100644 --- a/yjyf-app/components/master/MasterWorkbenchView.vue +++ b/yjyf-app/components/master/MasterWorkbenchView.vue @@ -51,7 +51,7 @@ - + {{ verifyStatusMeta.text }} diff --git a/yjyf-app/pages/master/apply.vue b/yjyf-app/pages/master/apply.vue index 3097c5f..c2fcc5f 100644 --- a/yjyf-app/pages/master/apply.vue +++ b/yjyf-app/pages/master/apply.vue @@ -197,6 +197,16 @@ {{ info.master.order_count }} 单 + 进入师傅工作台 @@ -217,6 +227,7 @@