- 新增 master/saveProfile 接口用于保存师傅资料 - 新增前端页面入口,允许已认证师傅修改头像和手机号 - 新增头像验证逻辑,确保头像属于当前用户且不超过10MB - 新增 masterProfilePayload 工具函数验证手机号格式 - 优化会员中心账号页面,新增头像上传和展示功能 - 修复头像URL处理逻辑,支持CDN地址转换
109 行
6.0 KiB
PHP
109 行
6.0 KiB
PHP
<?php
|
||
/**
|
||
* 优匠优服 · 第三轮 C-12 定时任务服务层验证
|
||
* 目的:证明 Order::autoVerifyExpired 逻辑本身可用(缺陷在于缺少调度入口,非逻辑缺陷)
|
||
* 验证:超时订单自动验收 → 状态8+结算+师傅入账+消息;幂等重跑不重复分账;未到期订单不动
|
||
*
|
||
* 运行:php tests/p3_cron_service.php(依赖 tests/p3_state.json)
|
||
*/
|
||
|
||
define('APP_PATH', __DIR__ . '/../server/application/');
|
||
require __DIR__ . '/../server/thinkphp/base.php';
|
||
\think\App::initCommon();
|
||
|
||
use think\Db;
|
||
use app\api\controller\Order;
|
||
|
||
$pass = 0;
|
||
$fail = 0;
|
||
$fails = [];
|
||
|
||
/** 记录单条用例结果(通过则计数,失败记录原因) */
|
||
function report($name, $cond, $extra = '')
|
||
{
|
||
global $pass, $fail, $fails;
|
||
if ($cond) {
|
||
$pass++;
|
||
echo " [PASS] {$name}" . ($extra !== '' ? " → {$extra}" : '') . "\n";
|
||
} else {
|
||
$fail++;
|
||
$fails[] = "{$name} :: {$extra}";
|
||
echo " [FAIL] {$name} → {$extra}\n";
|
||
}
|
||
}
|
||
|
||
$state = json_decode(file_get_contents(__DIR__ . '/p3_state.json'), true);
|
||
$orderId = (int)$state['cronOrderId'];
|
||
$masterId = (int)$state['masterId'];
|
||
|
||
echo "════════════════════════════════════════════════════════\n";
|
||
echo " 第三轮 C-12 服务层验证 order_id={$orderId} master_id={$masterId}\n";
|
||
echo "════════════════════════════════════════════════════════\n\n";
|
||
|
||
$order = Db::name('order')->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);
|