fix: 修正退货确认回执北京时间 (#869)
回执和机器人最近推送时间改用平台时区,避免 UTC 导致北京时间少 8 小时。 Co-authored-by: 苏木 <594326199@qq.com> Co-committed-by: 苏木 <594326199@qq.com>
This commit is contained in:
parent
cf708b1131
commit
026733e919
@ -137,7 +137,7 @@ class SupplierDingTalkNotifier
|
||||
);
|
||||
}
|
||||
|
||||
$config['last_pushed_at'] = now()->format('Y-m-d H:i:s');
|
||||
$config['last_pushed_at'] = $this->platformTimestamp();
|
||||
$config['last_push_count'] = count($differences);
|
||||
$configs[$supplier] = $config;
|
||||
$this->persist($configs);
|
||||
@ -182,7 +182,7 @@ class SupplierDingTalkNotifier
|
||||
),
|
||||
);
|
||||
|
||||
$config['last_pushed_at'] = now()->format('Y-m-d H:i:s');
|
||||
$config['last_pushed_at'] = $this->platformTimestamp();
|
||||
$config['last_push_count'] = count($returns);
|
||||
$configs[$supplier] = $config;
|
||||
$this->persist($configs);
|
||||
@ -210,7 +210,7 @@ class SupplierDingTalkNotifier
|
||||
'- 本次确认:**' . max(0, $confirmedRows) . '** 行退货扣减',
|
||||
'- 异议保留:**' . max(0, $disputedRows) . '** 行',
|
||||
'- 确认方式:厂家通过退货明细链接确认',
|
||||
'- 确认时间:' . now()->format('Y-m-d H:i:s'),
|
||||
'- 确认时间:' . $this->platformTimestamp(),
|
||||
'- 系统状态:**已回传财务系统**',
|
||||
];
|
||||
|
||||
@ -225,6 +225,13 @@ class SupplierDingTalkNotifier
|
||||
return true;
|
||||
}
|
||||
|
||||
private function platformTimestamp(): string
|
||||
{
|
||||
$timezone = trim((string) config('app.platform_timezone', ''));
|
||||
|
||||
return now($timezone !== '' ? $timezone : 'Asia/Shanghai')->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<array<string,mixed>> $rows
|
||||
* @return array{count:int,extra:int,mismatch:int,missing:int,difference_amount:float}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
namespace Tests\Feature\Business;
|
||||
|
||||
use App\Models\Auth\Permission;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Routing\Exceptions\InvalidSignatureException;
|
||||
use Modules\EcommerceFinance\Services\SupplierDingTalkNotifier;
|
||||
@ -671,6 +672,11 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase
|
||||
);
|
||||
$this->saveRobot();
|
||||
Http::fake(['*' => Http::response(['errcode' => 0, 'errmsg' => 'ok'])]);
|
||||
config([
|
||||
'app.timezone' => 'UTC',
|
||||
'app.platform_timezone' => 'Asia/Shanghai',
|
||||
]);
|
||||
$this->travelTo(Carbon::parse('2026-11-04 07:09:02', 'UTC'));
|
||||
|
||||
$pageUrl = app(SupplierReturnShareLink::class)->pageUrl($companyId, '晨丰', '2026-10');
|
||||
$page = $this->get($pageUrl)->assertOk();
|
||||
@ -694,6 +700,9 @@ class SupplierReconciliationDingTalkTest extends FeatureTestCase
|
||||
) && str_contains(
|
||||
(string) ($request['markdown']['text'] ?? ''),
|
||||
'系统状态:**已回传财务系统**',
|
||||
) && str_contains(
|
||||
(string) ($request['markdown']['text'] ?? ''),
|
||||
'确认时间:2026-11-04 15:09:02',
|
||||
));
|
||||
|
||||
$statuses = app(SupplierReturnConfirmation::class)->statuses('晨丰', $companyId);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user