error_outline
@@ -2733,7 +2794,7 @@
{{ $directoryHasGroupedHeader ? '两层合并表头按固定列顺序渲染，仅可切换显示字段。' : '拖动字段调整顺序；固定序号列不可隐藏。' }}
@foreach ($directoryFields as $field)
@endforeach
@@ -2865,6 +2926,20 @@
} elseif ($kind === 'boolean' && $value !== null && $value !== '') {
$display = in_array($value, [true, 1, '1', '是', '✔'], true) ? '是' : '否';
}
+ $badgeTone = null;
+ if ($kind === 'badge') {
+ $badgeText = trim((string) ($display ?? ''));
+ $badgeTone = (string) (($field['tones'] ?? [])[$badgeText] ?? 'neutral');
+ if ($badgeTone === 'neutral') {
+ $badgeTone = match (true) {
+ in_array($badgeText, ['正常', '开店中', '存续中', '有效', '已完成', '已通过', '是'], true) => 'success',
+ in_array($badgeText, ['已注销', '已关闭', '关店', '拒绝', '已拒绝'], true) => 'danger',
+ in_array($badgeText, ['待维护', '关店中', '关闭中', '未启用', '未设置', '待处理', '待审批', '暂存'], true) => 'warning',
+ in_array($badgeText, ['/'], true) => 'muted',
+ default => 'neutral',
+ };
+ }
+ }
@endphp
@if (($page['slug'] ?? '') === 'store-accounts' && $field['name'] === 'password_configured')
@@ -2882,7 +2957,11 @@
@endif
@else
- {{ filled($display) ? $display : ($isInventoryReportPage && $field['name'] === 'warehouse_short_name' ? '' : '—') }}
+ @if ($kind === 'badge' && filled($display))
+ {{ $display }}
+ @else
+ {{ filled($display) ? $display : ($isInventoryReportPage && $field['name'] === 'warehouse_short_name' ? '' : '—') }}
+ @endif
@endif
|
@endforeach
diff --git a/tests/Feature/Business/InternalFlowReportPageTest.php b/tests/Feature/Business/InternalFlowReportPageTest.php
index f065a267..fd73af8a 100644
--- a/tests/Feature/Business/InternalFlowReportPageTest.php
+++ b/tests/Feature/Business/InternalFlowReportPageTest.php
@@ -33,6 +33,13 @@ class InternalFlowReportPageTest extends FeatureTestCase
'invoicing_ratio' => '1',
]],
'total' => 1,
+ 'summary' => [
+ 'companies' => 1,
+ 'projected_sales' => 1200000.0,
+ 'receipt_total' => 0.0,
+ 'remaining_gap' => 0.0,
+ 'average_invoicing_ratio' => 100.0,
+ ],
]);
$this->app->instance(InternalFlowReportRepository::class, $repository);
@@ -49,6 +56,11 @@ class InternalFlowReportPageTest extends FeatureTestCase
->assertSeeText('收票-内部流转（来源）1')
->assertSeeText('剩余缺口')
->assertSeeText('开票比例')
+ ->assertSeeText('公司数')
+ ->assertSeeText('预计销量合计')
+ ->assertSeeText('已收票合计')
+ ->assertSeeText('剩余缺口合计')
+ ->assertSeeText('平均开票比例')
->assertSee('data-directory-query-picker', false)
->assertSee('data-directory-query-export', false)
->assertSee('data-directory-query-field="company_name"', false)
diff --git a/tests/Feature/Business/PrototypePageTest.php b/tests/Feature/Business/PrototypePageTest.php
index 333e5b27..9eabc4b6 100644
--- a/tests/Feature/Business/PrototypePageTest.php
+++ b/tests/Feature/Business/PrototypePageTest.php
@@ -46,11 +46,13 @@ class PrototypePageTest extends FeatureTestCase
->assertSeeText('主账号')
->assertSeeText('已设置')
->assertSeeText('13800000000')
+ ->assertSee('directory-value-badge', false)
+ ->assertSee('data-tone="accent"', false)
->assertDontSeeText('MAIN')
->assertDontSeeText('共享镜像中暂未读取到店铺账号数据');
}
- public function testSharedBusinessPagesRenderClickableSummaryCards(): void
+ public function testBaseInformationPagesDoNotRenderSummaryCards(): void
{
$rows = new LengthAwarePaginator([(object) [
'id' => 'account-summary',
@@ -64,15 +66,7 @@ class PrototypePageTest extends FeatureTestCase
->shouldReceive('paginate')
->once()
->with('store-management', 'store-accounts', 50)
- ->andReturnUsing(function () use ($rows): LengthAwarePaginator {
- request()->attributes->set('business-page-summary-cards', [
- ['label' => '账号总数', 'value' => 958, 'hint' => '当前筛选内账号记录', 'format' => 'integer', 'query' => ['page' => null]],
- ['label' => '主账号', 'value' => 640, 'hint' => '账号类型为 MAIN', 'format' => 'integer', 'query' => ['page' => null, 'account_type' => '主账号']],
- ['label' => '子账号', 'value' => 318, 'hint' => '账号类型为 SUB', 'format' => 'integer', 'query' => ['page' => null, 'account_type' => '子账号']],
- ]);
-
- return $rows;
- });
+ ->andReturn($rows);
$this->loginAs()
->get(route('business.pages.show', [
@@ -81,16 +75,56 @@ class PrototypePageTest extends FeatureTestCase
'account_type' => '主账号',
]))
->assertOk()
- ->assertSee('data-business-summary-cards', false)
- ->assertSee('data-business-summary-card="账号总数"', false)
- ->assertSee('data-business-summary-card="主账号"', false)
- ->assertSee('data-business-summary-card="子账号"', false)
- ->assertSee('account_type=', false)
- ->assertSee('aria-current="true"', false)
- ->assertSeeText('958')
- ->assertSeeText('640')
- ->assertSeeText('318')
- ->assertSee('查看明细', false);
+ ->assertDontSee('data-business-summary-cards', false);
+ }
+
+ public function testOperatingReportPagesRenderTableSpecificSummaryCards(): void
+ {
+ $pages = [
+ ['company-cost-arrangement', ['数据状态', '完整表头', '11 列', '核心结果', '缺口提示', '配平提示']],
+ ['tax-forecast', ['数据状态', '完整表头', '22 列', '计算税种', '必补口径', '当前记录']],
+ ['personnel-inventory', ['数据状态', '完整表头', '17 列', '敏感字段', '容量规则', '当前记录']],
+ ];
+
+ foreach ($pages as [$page, $labels]) {
+ $response = $this->loginAs()->get(route('business.pages.show', [
+ 'section' => 'company-management',
+ 'page' => $page,
+ ]));
+
+ $response->assertOk()->assertSee('data-business-summary-cards', false);
+ foreach ($labels as $label) {
+ $response->assertSeeText($label);
+ }
+ }
+ }
+
+ public function testOperatingReportFieldContractsKeepAllOriginalHeaders(): void
+ {
+ $navigation = require config_path('business_navigation.php');
+ $pages = collect($navigation)
+ ->flatMap(static fn (array $section) => collect($section['pages'] ?? [])
+ ->map(static fn (array $page): array => [
+ 'key' => $section['slug'] . '/' . $page['slug'],
+ 'fields' => $page['directory']['fields'] ?? [],
+ ]))
+ ->keyBy('key');
+ $expectedFieldCounts = [
+ 'company-management/subject-operating-report' => 21,
+ 'company-management/company-cost-arrangement' => 10,
+ 'company-management/tax-forecast' => 21,
+ 'company-management/personnel-inventory' => 16,
+ 'store-management/store-report' => 26,
+ 'store-management/internal-flow-report' => 15,
+ ];
+
+ foreach ($expectedFieldCounts as $key => $count) {
+ $fields = $pages[$key]['fields'];
+ $names = array_column($fields, 'name');
+
+ $this->assertCount($count, $fields, $key . ' 的字段数量不应减少');
+ $this->assertCount($count, array_unique($names), $key . ' 的字段名不应重复');
+ }
}
public function testNavigationUsesConfiguredPermissionsAndTitles(): void
@@ -150,6 +184,8 @@ class PrototypePageTest extends FeatureTestCase
->assertSeeText('测试主体')
->assertSeeText('小规模纳税人')
->assertSeeText('个人独资企业')
+ ->assertSee('directory-value-badge', false)
+ ->assertSee('data-tone="info"', false)
->assertSeeText('共 1 条')
->assertSeeText('已从共享业务镜像读取')
->assertDontSee('
', false)
@@ -191,16 +227,11 @@ class PrototypePageTest extends FeatureTestCase
->assertSeeTextInOrder(['最近12个月累计收入', '1月收入', '12月收入']);
}
- public function testSubjectOperatingReportHidesMonthsWithoutDataAndKeepsThemSelectable(): void
+ public function testSubjectOperatingReportShowsAllMonthsByDefaultAndStillSupportsColumnSelection(): void
{
$service = Mockery::mock(UpstreamBusinessInformation::class);
$service->shouldReceive('paginate')->with('company-management', 'subject-operating-report', 50)
->andReturnUsing(function (): LengthAwarePaginator {
- request()->attributes->set(
- 'subject-operating-report.default_hidden_columns',
- ['income_01', 'income_02'],
- );
-
return new LengthAwarePaginator([(object) [
'entity' => '测试主体',
'city' => '常州市',
@@ -224,14 +255,13 @@ class PrototypePageTest extends FeatureTestCase
$response->assertOk();
$html = $response->getContent();
- // 没有数据的月份默认隐藏，但表头和「筛选字段」勾选项仍在页面中。
- $this->assertMatchesRegularExpression('/]*data-column-key="income_01"[^>]*is-column-hidden/', $html);
- $this->assertMatchesRegularExpression('/]*data-column-key="income_02"[^>]*is-column-hidden/', $html);
+ // 所有原始月份表头默认显示，避免新增汇总卡后缩减原表字段。
+ $this->assertDoesNotMatchRegularExpression('/]*data-column-key="income_01"[^>]*is-column-hidden/', $html);
+ $this->assertDoesNotMatchRegularExpression('/]*data-column-key="income_02"[^>]*is-column-hidden/', $html);
$this->assertDoesNotMatchRegularExpression('/]*data-column-key="income_03"[^>]*is-column-hidden/', $html);
$this->assertStringContainsString('value="income_01" data-directory-query-column', $html);
- $this->assertStringNotContainsString('value="income_01" data-directory-query-column checked', $html);
+ $this->assertStringContainsString('value="income_01" data-directory-query-column checked', $html);
$this->assertStringContainsString('value="income_03" data-directory-query-column checked', $html);
- $this->assertStringContainsString('筛选字段 19/21', $html);
// 手动勾选（columns 参数）后，对应月份列恢复显示。
$restored = $this->get(route('business.pages.show', [
@@ -247,16 +277,11 @@ class PrototypePageTest extends FeatureTestCase
$this->assertMatchesRegularExpression('/]*data-column-key="income_04"[^>]*is-column-hidden/', $restoredHtml);
}
- public function testStoreReportHidesSalesMonthsWithoutDataAndKeepsThemSelectable(): void
+ public function testStoreReportShowsAllMonthsByDefaultAndStillSupportsColumnSelection(): void
{
$service = Mockery::mock(UpstreamBusinessInformation::class);
$service->shouldReceive('paginate')->with('store-management', 'store-report', 50)
->andReturnUsing(function (): LengthAwarePaginator {
- request()->attributes->set(
- 'store-report.default_hidden_columns',
- ['sales_01', 'sales_08'],
- );
-
return new LengthAwarePaginator([(object) [
'erp_store_name' => 'ERP测试店铺',
'store_name' => '前台测试店铺',
@@ -280,14 +305,13 @@ class PrototypePageTest extends FeatureTestCase
$response->assertOk();
$html = $response->getContent();
- // 没有业绩的月份默认隐藏，但表头和「筛选字段」勾选项仍在页面中。
- $this->assertMatchesRegularExpression('/]*data-column-key="sales_01"[^>]*is-column-hidden/', $html);
- $this->assertMatchesRegularExpression('/]*data-column-key="sales_08"[^>]*is-column-hidden/', $html);
+ // 所有原始月份表头默认显示，避免新增汇总卡后缩减原表字段。
+ $this->assertDoesNotMatchRegularExpression('/]*data-column-key="sales_01"[^>]*is-column-hidden/', $html);
+ $this->assertDoesNotMatchRegularExpression('/]*data-column-key="sales_08"[^>]*is-column-hidden/', $html);
$this->assertDoesNotMatchRegularExpression('/]*data-column-key="sales_07"[^>]*is-column-hidden/', $html);
$this->assertStringContainsString('value="sales_01" data-directory-query-column', $html);
- $this->assertStringNotContainsString('value="sales_01" data-directory-query-column checked', $html);
+ $this->assertStringContainsString('value="sales_01" data-directory-query-column checked', $html);
$this->assertStringContainsString('value="sales_07" data-directory-query-column checked', $html);
- $this->assertStringContainsString('筛选字段 24/26', $html);
// 手动勾选（columns 参数）后，对应月份列恢复显示。
$restored = $this->get(route('business.pages.show', [
diff --git a/tests/Feature/Console/InternalFlowReportImportTest.php b/tests/Feature/Console/InternalFlowReportImportTest.php
index e6ade459..f757b094 100644
--- a/tests/Feature/Console/InternalFlowReportImportTest.php
+++ b/tests/Feature/Console/InternalFlowReportImportTest.php
@@ -117,6 +117,11 @@ class InternalFlowReportImportTest extends TestCase
$all = $repository->paginate(1, 50);
$this->assertSame(3, $all['total']);
$this->assertSame('示例甲供应链有限公司', $all['data'][0]['company_name']);
+ $this->assertSame(3, $all['summary']['companies']);
+ $this->assertSame(3669135.68, $all['summary']['projected_sales']);
+ $this->assertSame(1420000.61, $all['summary']['receipt_total']);
+ $this->assertEqualsWithDelta(1401086.9311, $all['summary']['remaining_gap'], 0.005);
+ $this->assertEqualsWithDelta(71.0, $all['summary']['average_invoicing_ratio'], 0.000001);
$filtered = $repository->paginate(1, 50, ['company_name' => '示例乙']);
$this->assertSame(1, $filtered['total']);
diff --git a/tests/Unit/EcommerceFinance/BusinessInformationMirrorRepositoryTest.php b/tests/Unit/EcommerceFinance/BusinessInformationMirrorRepositoryTest.php
index 25657854..26d8fe6e 100644
--- a/tests/Unit/EcommerceFinance/BusinessInformationMirrorRepositoryTest.php
+++ b/tests/Unit/EcommerceFinance/BusinessInformationMirrorRepositoryTest.php
@@ -136,6 +136,8 @@ class BusinessInformationMirrorRepositoryTest extends TestCase
$this->assertSame(1, $businessTypedCompany['total']);
$this->assertSame('个人独资企业', $businessTypedCompany['data'][0]['business_registration_type']);
$this->assertSame(1, $cityCompany['total']);
+ $this->assertSame('保留', $companyClassifications['新公司']['status']);
+ $this->assertSame('待注销', $companyClassifications['其他公司']['status']);
$this->assertSame('小规模纳税人', $companyClassifications['新公司']['tax_type']);
$this->assertSame('个人独资企业', $companyClassifications['新公司']['business_registration_type']);
$this->assertNull($companyClassifications['旧公司']['business_registration_type']);
diff --git a/tests/Unit/EcommerceFinance/StoreReportRepositoryTest.php b/tests/Unit/EcommerceFinance/StoreReportRepositoryTest.php
index 3c58f5df..9652f8cf 100644
--- a/tests/Unit/EcommerceFinance/StoreReportRepositoryTest.php
+++ b/tests/Unit/EcommerceFinance/StoreReportRepositoryTest.php
@@ -256,6 +256,7 @@ class StoreReportRepositoryTest extends TestCase
public function test_upstream_business_information_exposes_shared_store_report_rows(): void
{
+ Carbon::setTestNow('2026-07-15 10:00:00');
$this->insertBill('店铺A', '2026-07-05', 60);
$mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
$mirror->shouldReceive('ready')->with('store-information.read')->andReturnTrue();
@@ -287,14 +288,14 @@ class StoreReportRepositoryTest extends TestCase
$this->assertSame('部门负责人', $paginator->items()[0]->department_manager);
$this->assertSame('运营中心A', $paginator->items()[0]->profit_center);
$summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
- $this->assertSame(1, $summaryCards['店铺总数']['value']);
- $this->assertSame(1, $summaryCards['正常店铺']['value']);
- $this->assertSame(0, $summaryCards['关店中']['value']);
- $this->assertSame(0, $summaryCards['已关闭']['value']);
- $this->assertSame(60.0, (float) $summaryCards['期间销量']['value']);
+ $this->assertSame(1, $summaryCards['正常存续店铺']['value']);
+ $this->assertSame(0.0, (float) $summaryCards['上月（6月）销量']['value']);
+ $this->assertSame(60.0, (float) $summaryCards['当月（7月）销量']['value']);
+ $this->assertSame(0, $summaryCards['上月（6月）有销量店铺']['value']);
+ $this->assertSame(1, $summaryCards['当月（7月）有销量店铺']['value']);
}
- public function test_store_report_hides_sales_months_without_data_by_default(): void
+ public function test_store_report_keeps_all_sales_months_visible_by_default(): void
{
Carbon::setTestNow('2026-09-15 10:00:00');
$this->insertBill('店铺A', '2026-07-05', 60);
@@ -314,15 +315,44 @@ class StoreReportRepositoryTest extends TestCase
$paginator = $service->paginate('store-management', 'store-report', 50);
- // 只有 7 月有业绩，其余月份列默认隐藏。
- $this->assertSame(
- ['sales_01', 'sales_02', 'sales_03', 'sales_04', 'sales_05', 'sales_06', 'sales_08', 'sales_09', 'sales_10', 'sales_11', 'sales_12'],
+ $this->assertNull(
$this->app['request']->attributes->get('store-report.default_hidden_columns'),
);
$this->assertSame(1, $paginator->total());
$this->assertSame(60.0, (float) $paginator->items()[0]->sales_07);
}
+ public function test_store_cards_exclude_closed_store_but_keep_its_detail_row(): void
+ {
+ Carbon::setTestNow('2026-07-15 10:00:00');
+ $this->insertBill('正常店铺', '2026-07-05', 10);
+ $this->insertBill('已关店铺', '2026-07-06', 90);
+
+ $mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
+ $mirror->shouldReceive('ready')->with('store-information.read')->andReturnTrue();
+ $mirror->shouldReceive('allStores')->andReturn([
+ ['erp_store_name' => '正常店铺', 'company_name' => '主体甲', 'store_status' => '0'],
+ ['erp_store_name' => '已关店铺', 'company_name' => '主体乙', 'store_status' => '6'],
+ ]);
+ $accounts = Mockery::mock(StoreAccountMirrorRepository::class);
+ $accounts->shouldReceive('ownershipByStoreName')->andReturn([]);
+ $service = new UpstreamBusinessInformation(
+ Mockery::mock(UpstreamQueryCacheFactory::class),
+ $mirror,
+ $this->repository,
+ $accounts,
+ );
+
+ $paginator = $service->paginate('store-management', 'store-report', 50);
+ $summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
+
+ // 已关店铺明细继续保留，只从“正常存续”汇总卡中剔除。
+ $this->assertSame(2, $paginator->total());
+ $this->assertSame(1, $summaryCards['正常存续店铺']['value']);
+ $this->assertSame(10.0, (float) $summaryCards['当月（7月）销量']['value']);
+ $this->assertSame(1, $summaryCards['当月（7月）有销量店铺']['value']);
+ }
+
public function test_subject_operating_report_aggregates_income_by_entity(): void
{
Carbon::setTestNow('2026-09-01 10:00:00');
@@ -371,10 +401,12 @@ class StoreReportRepositoryTest extends TestCase
$this->assertSame('小规模纳税人', $rows[0]->tax_type);
$this->assertSame('个人独资企业', $rows[0]->business_registration_type);
$summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
- $this->assertSame(1, $summaryCards['主体总数']['value']);
- $this->assertSame(1, $summaryCards['有效主体']['value']);
- $this->assertSame(0, $summaryCards['已注销主体']['value']);
- $this->assertSame(90.0, (float) $summaryCards['最近12个月收入']['value']);
+ $this->assertSame(1, $summaryCards['正常存续主体']['value']);
+ $this->assertSame(70.0, (float) $summaryCards['上月（8月）收入']['value']);
+ $this->assertSame(0.0, (float) $summaryCards['当月（9月）收入']['value']);
+ $this->assertSame(1, $summaryCards['小规模纳税人']['value']);
+ $this->assertSame(0, $summaryCards['一般纳税人']['value']);
+ $this->assertArrayNotHasKey('最近12个月收入', $summaryCards);
request()->merge(['income_08' => '70.00']);
$this->assertSame(1, $service->paginate('company-management', 'subject-operating-report', 50)->total());
@@ -392,6 +424,110 @@ class StoreReportRepositoryTest extends TestCase
$this->assertSame(0, $service->paginate('company-management', 'subject-operating-report', 50)->total());
}
+ public function test_subject_cards_exclude_deregistered_entities_and_show_slash_for_their_types(): void
+ {
+ Carbon::setTestNow('2026-09-15 10:00:00');
+ $this->insertBill('店铺正常', '2026-08-05', 30);
+ $this->insertBill('店铺注销', '2026-08-06', 70);
+
+ $mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
+ $mirror->shouldReceive('ready')->with('store-information.read')->andReturnTrue();
+ $mirror->shouldReceive('ready')->with('company-information.read')->andReturnTrue();
+ $mirror->shouldReceive('allStores')->andReturn([
+ ['erp_store_name' => '店铺正常', 'company_name' => '存续主体', 'store_status' => '0'],
+ ['erp_store_name' => '店铺注销', 'company_name' => '注销主体', 'store_status' => '0'],
+ ]);
+ $mirror->shouldReceive('companiesByNames')->andReturn([
+ '存续主体' => [[
+ 'Id' => 2,
+ 'businessLicenseName' => '存续主体',
+ 'companyStatus' => '0',
+ 'taxCategoryAndType' => '小规模',
+ 'business_registration_type' => null,
+ ]],
+ '注销主体' => [[
+ 'Id' => 1,
+ 'businessLicenseName' => '注销主体',
+ 'companyStatus' => '1',
+ 'taxCategoryAndType' => '一般纳税人',
+ 'business_registration_type' => '有限公司',
+ ]],
+ ]);
+ $mirror->shouldReceive('companyClassificationsByNames')->andReturn([]);
+ $accounts = Mockery::mock(StoreAccountMirrorRepository::class);
+ $accounts->shouldReceive('ownershipByStoreName')->andReturn([]);
+ $service = new UpstreamBusinessInformation(
+ Mockery::mock(UpstreamQueryCacheFactory::class),
+ $mirror,
+ $this->repository,
+ $accounts,
+ );
+
+ $rows = collect($service->paginate('company-management', 'subject-operating-report', 50)->items())->keyBy('entity');
+ $summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
+
+ $this->assertSame('小规模纳税人', $rows['存续主体']->tax_type);
+ $this->assertSame('待维护', $rows['存续主体']->business_registration_type);
+ $this->assertSame('/', $rows['注销主体']->tax_type);
+ $this->assertSame('/', $rows['注销主体']->business_registration_type);
+ $this->assertSame(1, $summaryCards['正常存续主体']['value']);
+ $this->assertSame(30.0, (float) $summaryCards['上月（8月）收入']['value']);
+ $this->assertSame(1, $summaryCards['小规模纳税人']['value']);
+ $this->assertSame(0, $summaryCards['一般纳税人']['value']);
+ }
+
+ public function test_subject_uses_company_ledger_retained_tag_for_operating_population(): void
+ {
+ Carbon::setTestNow('2026-09-15 10:00:00');
+ $this->insertBill('保留店铺', '2026-08-05', 30);
+ $this->insertBill('待注销店铺', '2026-08-06', 70);
+
+ $mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
+ $mirror->shouldReceive('ready')->with('store-information.read')->andReturnTrue();
+ $mirror->shouldReceive('ready')->with('company-information.read')->andReturnTrue();
+ $mirror->shouldReceive('allStores')->andReturn([
+ ['erp_store_name' => '保留店铺', 'company_name' => '保留主体', 'store_status' => '0'],
+ ['erp_store_name' => '待注销店铺', 'company_name' => '待注销主体', 'store_status' => '0'],
+ ]);
+ $mirror->shouldReceive('companiesByNames')->andReturn([
+ '保留主体' => [[
+ 'Id' => 1,
+ 'businessLicenseName' => '保留主体',
+ 'companyStatus' => '0',
+ 'taxCategoryAndType' => '小规模纳税人',
+ 'business_registration_type' => '/',
+ ]],
+ '待注销主体' => [[
+ 'Id' => 2,
+ 'businessLicenseName' => '待注销主体',
+ 'companyStatus' => '0',
+ 'taxCategoryAndType' => '一般纳税人',
+ 'business_registration_type' => '核定',
+ ]],
+ ]);
+ $mirror->shouldReceive('companyClassificationsByNames')->andReturn([
+ '保留主体' => ['status' => '保留', 'tax_type' => '小规模纳税人', 'business_registration_type' => null],
+ '待注销主体' => ['status' => '待注销', 'tax_type' => '一般纳税人', 'business_registration_type' => '核定'],
+ ]);
+ $accounts = Mockery::mock(StoreAccountMirrorRepository::class);
+ $accounts->shouldReceive('ownershipByStoreName')->andReturn([]);
+ $service = new UpstreamBusinessInformation(
+ Mockery::mock(UpstreamQueryCacheFactory::class),
+ $mirror,
+ $this->repository,
+ $accounts,
+ );
+
+ $rows = collect($service->paginate('company-management', 'subject-operating-report', 50)->items())->keyBy('entity');
+ $summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
+
+ $this->assertSame('待维护', $rows['保留主体']->business_registration_type);
+ $this->assertSame('/', $rows['待注销主体']->tax_type);
+ $this->assertSame('/', $rows['待注销主体']->business_registration_type);
+ $this->assertSame(1, $summaryCards['正常存续主体']['value']);
+ $this->assertSame(30.0, (float) $summaryCards['上月（8月）收入']['value']);
+ }
+
private function insertBill(string $store, string $occurredOn, float $income): void
{
$this->insertIncome($store, $occurredOn, $income);
diff --git a/tests/Unit/EcommerceFinance/UpstreamBusinessInformationTest.php b/tests/Unit/EcommerceFinance/UpstreamBusinessInformationTest.php
index e139881f..444fa866 100644
--- a/tests/Unit/EcommerceFinance/UpstreamBusinessInformationTest.php
+++ b/tests/Unit/EcommerceFinance/UpstreamBusinessInformationTest.php
@@ -160,14 +160,10 @@ class UpstreamBusinessInformationTest extends TestCase
$this->assertNotSame('运营总监', $paginator->items()[0]->department_manager);
$this->assertSame('正常', $paginator->items()[0]->store_status);
$summaryCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
- $this->assertSame(1, $summaryCards['店铺总数']['value']);
- $this->assertSame(1, $summaryCards['正常店铺']['value']);
- $this->assertSame(0, $summaryCards['关闭中']['value']);
- $this->assertSame(0, $summaryCards['已关闭']['value']);
- $this->assertSame(1, $summaryCards['平台数']['value']);
+ $this->assertSame([], $summaryCards->all());
}
- public function test_company_and_trademark_mirror_summaries_become_clickable_cards(): void
+ public function test_base_information_pages_do_not_render_summary_cards(): void
{
$mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
$mirror->shouldReceive('ready')->times(2)->andReturnUsing(
@@ -203,16 +199,11 @@ class UpstreamBusinessInformationTest extends TestCase
);
$information->paginate('company-management', 'basic-information', 50);
$companyCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
- $this->assertSame(818, $companyCards['公司总数']['value']);
- $this->assertSame(['page' => null, 'company_status' => '正常'], $companyCards['正常公司']['query']);
- $this->assertSame(['page' => null, 'taxpayer_type' => '一般纳税人'], $companyCards['一般纳税人']['query']);
+ $this->assertSame([], $companyCards->all());
$information->paginate('trademark-management', 'information', 50);
$trademarkCards = collect($this->app['request']->attributes->get('business-page-summary-cards'))->keyBy('label');
- $this->assertSame(593, $trademarkCards['商标总数']['value']);
- $this->assertSame(45, $trademarkCards['未启用']['value']);
- $this->assertSame(['page' => null, 'trademark_status' => '有效'], $trademarkCards['有效商标']['query']);
- $this->assertSame('final_holder', $trademarkCards['最终持有人']['query']['sort']);
+ $this->assertSame([], $trademarkCards->all());
}
public function test_bootstrap_without_mirror_explains_shared_connection_instead_of_requesting_upstream_credentials(): void
@@ -228,7 +219,7 @@ class UpstreamBusinessInformationTest extends TestCase
->paginate('store-management', 'basic-information');
}
- public function test_subject_operating_report_hides_income_months_without_data_by_default(): void
+ public function test_subject_operating_report_keeps_all_income_months_visible_by_default(): void
{
$mirror = Mockery::mock(BusinessInformationMirrorRepository::class);
$mirror->shouldReceive('ready')->with('store-information.read')->andReturnTrue();
@@ -267,9 +258,7 @@ class UpstreamBusinessInformationTest extends TestCase
$paginator = $information->paginate('company-management', 'subject-operating-report', 50);
- // income_02 有金额、income_03 为 0 都算有数据，其余空月份默认隐藏。
- $this->assertSame(
- ['income_01', 'income_04', 'income_05', 'income_06', 'income_07', 'income_08', 'income_09', 'income_10', 'income_11', 'income_12'],
+ $this->assertNull(
$this->app['request']->attributes->get('subject-operating-report.default_hidden_columns'),
);
$this->assertSame(1, $paginator->total());