fix(settle): 恢复收益中心与兑换券释放为原日结结算时间

这个提交包含在:
chen
2026-09-28 11:06:35 +08:00
父节点 30b704f581
当前提交 40f36c8889
共有 3 个文件被更改,包括 32 次插入 和 33 次删除

查看文件

@@ -14,19 +14,19 @@ class PartnerSettle extends Command
protected function configure()
{
$this->setName('shopro:partner:settle')
->addOption('date', 'd', Option::VALUE_OPTIONAL, '结算日期 Y-m-d,指定日期时执行传统日结')
->addOption('date', 'd', Option::VALUE_OPTIONAL, '结算日期 Y-m-d,默认昨天')
->addOption('rerun', 'r', Option::VALUE_NONE, '删除当天日结后重算')
->addOption('daily', null, Option::VALUE_NONE, '强制执行昨天标准日结')
->addOption('minute', 'm', Option::VALUE_NONE, '执行分钟级增量结算与兑换券释放(联调测试用)')
->addOption('compensate', 'c', Option::VALUE_NONE, '执行未结算订单自动对账与补偿发放')
->addOption('check', null, Option::VALUE_NONE, '收益中心与队列运行健康度体检诊断')
->setDescription('收益中心结算(默认1分钟dmepa增量结算与兑换券释放,支持指定日期日结及未结算补偿)');
->setDescription('收益中心日结(DMEPA/馆县均分/兑换券释放,默认每日结算昨天)');
}
protected function execute(Input $input, Output $output)
{
$date = $input->getOption('date');
$rerun = (bool) $input->getOption('rerun');
$isDaily = (bool) $input->getOption('daily');
$isMinute = (bool) $input->getOption('minute');
$isCompensate = (bool) $input->getOption('compensate');
$isCheck = (bool) $input->getOption('check');
@@ -46,34 +46,34 @@ class PartnerSettle extends Command
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' : ''));
// 3. 显式指定分钟级调度模式(联调调试测试)
if ($isMinute) {
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle start');
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));
$result = (new DailySettleService())->runMinute();
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle done: ' . json_encode($result, JSON_UNESCAPED_UNICODE));
return 0;
} catch (\Exception $e) {
$output->writeln('partner daily settle fail: ' . $e->getMessage());
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle fail: ' . $e->getMessage());
return 1;
}
}
// 4. 默认执行 1 分钟dmepa增量结算与兑换券释放
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle start');
// 4. 默认原标准日结模式(每日凌晨结算昨天,支持 -d 指定日期与 -r 重跑)
$settleDate = $date ?: date('Y-m-d', strtotime('-1 day'));
$output->writeln('partner daily settle start ' . $settleDate . ($rerun ? ' rerun' : ''));
try {
$result = (new DailySettleService())->runMinute();
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle done: ' . json_encode($result, JSON_UNESCAPED_UNICODE));
// 日结前置:扫描并补偿未结算即时奖订单,避免影响大盘 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;
} catch (\Exception $e) {
$output->writeln('[' . date('Y-m-d H:i:s') . '] partner minute settle fail: ' . $e->getMessage());
$output->writeln('partner daily settle fail: ' . $e->getMessage());
return 1;
}
}

查看文件

@@ -144,8 +144,8 @@ class VoucherService
return null;
}
$daily = round($total / $days, 2);
// 临时模式:当天立即生效起算,支持 1 分钟释放联调
$startDate = date('Y-m-d', $this->orderTime($order));
// 生产标准模式:下单次日生效起算,按 365 天线性释放
$startDate = date('Y-m-d', strtotime('+1 day', $this->orderTime($order)));
$plan = VoucherPlan::create([
'user_id' => $buyerId,