更新

server/tests/ConversionFanEventRuleTest.php

@@ -34,7 +34,7 @@ conversionFanRuleExpect(
 );
 conversionFanRuleExpect(
     str_contains($methodSource, "['del_external_contact', \$endTimestamp]"),
-    '加粉统计必须继续排除区间内已删除客户'
+    '加粉统计必须继续识别区间内已删除客户'
 );
 conversionFanRuleExpect(
     str_contains($methodSource, "['add_external_contact', \$startTimestamp]"),
@@ -56,12 +56,26 @@ conversionFanRuleExpect(
     '取消会话存档条件后仍须排除扫一扫、搜手机号、名片分享及继承/分配客户'
 );
 
+$buildCountMethod = new ReflectionMethod(ConversionLogic::class, 'buildFanCountRows');
+$buildCountSource = implode('', array_slice(
+    $sourceLines,
+    $buildCountMethod->getStartLine() - 1,
+    $buildCountMethod->getEndLine() - $buildCountMethod->getStartLine() + 1
+));
+conversionFanRuleExpect(
+    str_contains($buildCountSource, "++\$countsByUser[\$userId]['add_fans_count']")
+    && str_contains($buildCountSource, "++\$countsByUser[\$userId]['deleted_fans_count']"),
+    '区间内已删除客户必须计入加粉总数，并同时计入已删除提示子集'
+);
+
 $pageSource = file_get_contents(
     dirname(__DIR__, 2) . '/admin/src/views/first_visit/conversion/index.vue'
 );
 conversionFanRuleExpect(
-    is_string($pageSource) && !str_contains($pageSource, '须会话同意'),
-    '页面口径说明不能继续宣称加粉依赖会话存档同意'
+    is_string($pageSource)
+    && !str_contains($pageSource, '须会话同意')
+    && str_contains($pageSource, '区间新增加粉（含已删除）'),
+    '页面口径须说明加粉包含已删除客户，且不能继续宣称依赖会话存档同意'
 );
 
 echo "Conversion fan event rule: OK\n";