diff --git a/modules/EcommerceFinance/Services/SupplierDingTalkNotifier.php b/modules/EcommerceFinance/Services/SupplierDingTalkNotifier.php index e3335dde..b046174f 100644 --- a/modules/EcommerceFinance/Services/SupplierDingTalkNotifier.php +++ b/modules/EcommerceFinance/Services/SupplierDingTalkNotifier.php @@ -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> $rows * @return array{count:int,extra:int,mismatch:int,missing:int,difference_amount:float} diff --git a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php index 78865957..a4244625 100644 --- a/tests/Feature/Business/SupplierReconciliationDingTalkTest.php +++ b/tests/Feature/Business/SupplierReconciliationDingTalkTest.php @@ -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);