fix: 优化生产环境收益稳定发放与队列可靠性,支持自动对账补偿与幂等防重
这个提交包含在:
@@ -7,6 +7,7 @@ use think\console\Output;
|
||||
use think\console\input\Option;
|
||||
use think\console\Command;
|
||||
use addons\shopro\service\partner\DailySettleService;
|
||||
use addons\shopro\service\partner\PartnerCompensateService;
|
||||
|
||||
class PartnerSettle extends Command
|
||||
{
|
||||
@@ -16,7 +17,9 @@ class PartnerSettle extends Command
|
||||
->addOption('date', 'd', Option::VALUE_OPTIONAL, '结算日期 Y-m-d,指定日期时执行传统日结')
|
||||
->addOption('rerun', 'r', Option::VALUE_NONE, '删除当天日结后重算')
|
||||
->addOption('daily', null, Option::VALUE_NONE, '强制执行昨天标准日结')
|
||||
->setDescription('收益中心结算(默认1分钟dmepa增量结算与兑换券释放,亦支持指定日期日结)');
|
||||
->addOption('compensate', 'c', Option::VALUE_NONE, '执行未结算订单自动对账与补偿发放')
|
||||
->addOption('check', null, Option::VALUE_NONE, '收益中心与队列运行健康度体检诊断')
|
||||
->setDescription('收益中心结算(默认1分钟dmepa增量结算与兑换券释放,支持指定日期日结及未结算补偿)');
|
||||
}
|
||||
|
||||
protected function execute(Input $input, Output $output)
|
||||
@@ -24,12 +27,36 @@ class PartnerSettle extends Command
|
||||
$date = $input->getOption('date');
|
||||
$rerun = (bool) $input->getOption('rerun');
|
||||
$isDaily = (bool) $input->getOption('daily');
|
||||
$isCompensate = (bool) $input->getOption('compensate');
|
||||
$isCheck = (bool) $input->getOption('check');
|
||||
|
||||
// 指定日期或强制日结模式
|
||||
// 1. 系统健康度与漏单诊断体检模式
|
||||
if ($isCheck) {
|
||||
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner health check start...');
|
||||
$health = (new PartnerCompensateService())->checkHealth();
|
||||
$output->writeln('partner health check done: ' . json_encode($health, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 2. 独立对账补偿模式
|
||||
if ($isCompensate) {
|
||||
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner compensation start...');
|
||||
$compensateReport = (new PartnerCompensateService())->compensateAll(200);
|
||||
$output->writeln('partner compensation done: ' . json_encode($compensateReport, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 3. 指定日期或强制日结模式(前置自动执行补偿,确保无漏单)
|
||||
if ($date || $isDaily || $rerun) {
|
||||
$settleDate = $date ?: date('Y-m-d', strtotime('-1 day'));
|
||||
$output->writeln('partner daily settle start ' . $settleDate . ($rerun ? ' rerun' : ''));
|
||||
try {
|
||||
// 日结前置:扫描并补偿未结算即时奖订单,避免影响大盘 GMV 统计与分红池
|
||||
$compensateReport = (new PartnerCompensateService())->compensateAll(100);
|
||||
if (!empty($compensateReport['success_count'])) {
|
||||
$output->writeln(" [✓] 日结前置补偿已完成: 成功补发 {$compensateReport['success_count']} 笔订单即时奖");
|
||||
}
|
||||
|
||||
$report = (new DailySettleService())->run($date, $rerun);
|
||||
$output->writeln('partner daily settle done: ' . json_encode($report ? $report->toArray() : [], JSON_UNESCAPED_UNICODE));
|
||||
return 0;
|
||||
@@ -39,7 +66,7 @@ class PartnerSettle extends Command
|
||||
}
|
||||
}
|
||||
|
||||
// 默认执行 1 分钟dmepa增量结算与兑换券释放
|
||||
// 4. 默认执行 1 分钟dmepa增量结算与兑换券释放
|
||||
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle start');
|
||||
try {
|
||||
$result = (new DailySettleService())->runMinute();
|
||||
|
||||
在新工单中引用
屏蔽一个用户