fix: 业绩明细复用既有精确差额备注 #465

Merged
yueyang merged 2 commits from fix/yueyang-receipt-difference-combination into main 2026-10-23 10:51:43 +08:00
3 changed files with 139 additions and 3 deletions

View File

@ -381,7 +381,17 @@ class Pages extends Controller
$notBasisMarked = self::receiptReasonNotBasisMarkedSql();
$rules[$label . '未减冲减'] = "match_status = '已匹配' AND ABS(COALESCE($column, 0) - (COALESCE(income_amount, 0) + COALESCE(discount_amount, 0))) < 0.005 AND " . $notBasisMarked;
$rules[$label . '未减优惠'] = "match_status = '已匹配' AND ABS(COALESCE($column, 0) - (COALESCE(income_amount, 0) + COALESCE(offset_amount, 0))) < 0.005 AND " . $notBasisMarked;
$rules[$label . '未减优惠和冲减'] = "match_status = '已匹配' AND ABS(COALESCE($column, 0) - COALESCE(income_amount, 0)) < 0.005 AND " . $notBasisMarked;
$pddPaymentDiscountGuard = "NOT (platform = '拼多多' AND match_status = '已匹配'"
. ' AND ' . $effective . ' > 0.005'
. ' AND COALESCE(refund_amount, 0) < -0.005'
. ' AND (' . $effective . ' - COALESCE(discount_amount, 0) - COALESCE(offset_amount, 0)) > 0.005'
. ' AND (' . $effective . ' - COALESCE(discount_amount, 0) - COALESCE(offset_amount, 0)) <= 20.005)';
$rules[$label . '未减优惠和冲减'] = "match_status = '已匹配'"
. ' AND (ABS(COALESCE(' . $column . ', 0) - COALESCE(income_amount, 0)) < 0.005'
. ' OR ((ABS(COALESCE(discount_amount, 0)) > 0.005 OR ABS(COALESCE(offset_amount, 0)) > 0.005)'
. ' AND ABS(' . $effective . ' - (COALESCE(discount_amount, 0) + COALESCE(offset_amount, 0))) < 0.02'
. ' AND ' . $pddPaymentDiscountGuard . '))'
. ' AND ' . $notBasisMarked;
// 「订单实付含已退款部分」:
// 抖音——负差额能在聚水潭退款单/取消子单金额里对上(≈差额,或放宽口径 ≈实付−收入=差额+优惠+冲减)才标注。
@ -414,7 +424,13 @@ class Pages extends Controller
. ' OR ' . $refundGapHit($refundEvidence['cancelled_sum'])
. ' OR ' . $refundGapNetHit($refundEvidence['refund_sum'])
. ' OR ' . $refundFullHit($refundEvidence['refund_sum'])
. ') ELSE 0 END = 1) OR ' . $taoRefundHit . ' OR ' . $pddFullRefundHit;
. ') ELSE 0 END = 1) OR ' . $taoRefundHit . ' OR ' . $pddFullRefundHit
. ' OR (ABS(COALESCE(refund_amount, 0)) > 0.005'
. ' AND (ABS(' . $effective . ' - COALESCE(refund_amount, 0)) < 0.02'
. ' OR ((ABS(COALESCE(discount_amount, 0)) > 0.005 OR ABS(COALESCE(offset_amount, 0)) > 0.005)'
. ' AND ABS(' . $effective . ' - (COALESCE(refund_amount, 0)'
. ' + COALESCE(discount_amount, 0) + COALESCE(offset_amount, 0))) < 0.02))'
. ' AND ' . $notBasisMarked . ')';
// 拼多多部分退款:账单收入高于聚水潭买家实付,且扣除优惠/冲减后仍有正向小额差额,
// 与「多多支付立减」等平台支付类补贴一致;只标注原因,不改差额和收入。
@ -762,6 +778,23 @@ class Pages extends Controller
return '差额=分位四舍五入尾差';
}
$refund = (float) ($row->refund_amount ?? 0);
$hasRefund = abs($refund) > 0.005;
$hasDiscountOffset = abs($discount) > 0.005 || abs($offset) > 0.005;
if ($hasRefund && $hasDiscountOffset
&& abs($difference - ($refund + $discount + $offset)) < 0.02) {
return '订单实付含已退款部分';
}
if ($hasRefund && abs($difference - $refund) < 0.02) {
return '订单实付含已退款部分';
}
if (
$hasDiscountOffset
&& abs($difference - ($discount + $offset)) < 0.02
) {
return '订单实付未减优惠和冲减';
}
// 有差额但没命中任何已知原因:标「差额待核实」,页面上不再出现"有差额但备注空白"的行。
return '差额待核实';
}

View File

@ -822,7 +822,7 @@ $navigation = [
'directory' => [
'icon' => 'receipt_long',
'status' => '共享镜像',
'description' => '覆盖店铺收款账户账单各平台页签(总账备注=订单收入),按「店铺 + 订单号」匹配订单侧商品金额与订单实付金额;一行 = 一个店铺的一个订单,商品金额只挂一次。「商品金额」按「主单(拆单子单不参与)→ 原单行(merge_so_id 为空)→ 全部行」优先级取数,合单发货(原单与合并行共用同一线上单号、没有主单)时只取本单原单行,避免把合并的另一单算进来;并排除虚拟条码(X0000x:信誉订单 / 虚拟订单)明细行;「订单实付金额」取订单级实付(同一套优先级,末档兜底取该单号下最大值)再减去虚拟条码行实付。「优惠金额」「冲减金额」另取总账备注=优惠收入 / 冲减收入的账单金额,不计入收入金额;「退款金额」另取总账备注=退款的账单金额,只单独列示,不计入收入金额、也不参与差额;「种菜金额」是订单号在种菜明细表或聚水潭订单标签明细(是否种菜订单=是)任意一边出现过时,该订单的收入金额(两个条件是或的关系),只是收入金额里的一部分,不参与差额;差额=(收入金额+优惠金额+冲减金额)−订单实付金额,匹配状态与差额异常备注同样按订单实付金额判定,未匹配到订单实付金额的行按订单实付金额=0 计入差额,只反映真正对不上的部分。挂不到订单行的优惠/冲减会补成一行(收入/商品留空)。「差额异常备注」只说明差额为什么产生,按顺序自动判定:订单实付未匹配(未匹配到订单实付金额,具体原因看「匹配原因」列);订单实付取数为0(种菜)(订单实付=0 且是种菜单)、订单实付取数为0(订单实付=0 但不是种菜单)、订单实付未减联合营销费(仅得物负差额:联合营销费未让利尾数对上才标注)、订单实付取供货价(仅京喜正差额:差额=该单直营服务费(供货模式净收)时标注)、差额=直营补贴款(待开票结算)(仅京喜账单·京喜自营工厂店负差额且无退款(出类拔萃等 10 家已逐店核验,其余工厂店按实付≈商品金额的供货价特征识别):京东直营补贴款待开票结算时标注)、差额=直营补贴款(订单退款已冲回)(同批店负差额但订单已退款:补贴款已随退款冲回)、差额=订单实付包含商家承担优惠和以旧换新国补(仅京东账单·索菲亚客厅/办公/书房/功能、亿家达全屋、朴美家居店负差额、且该单含国补(聚水潭应付−账单收入>0):差额为商家承担优惠(店铺东券/单品折扣等)与以旧换新国补之和,已用营销对账逐单核实)、差额=订单实付包含商家承担优惠(同店负差额但不含国补的单:差额即商家承担优惠)、订单实付未减冲减(订单实付=收入+优惠 → 差额=冲减金额)、订单实付未减优惠(订单实付=收入+冲减 → 差额=优惠金额)、订单实付未减优惠和冲减(订单实付=收入 → 差额=优惠+冲减)(以上三档等式对带口径标识的行让位给口径兜底)、订单实付含已退款部分(抖音负差额:聚水潭退款单/取消子单金额≈差额,或退款合计+账单退款净额≈实付−收入,或整单全退(退款合计≈实付)对上才标注;淘系支付宝/微信负差额:差额=退款合计、或退款合计=实付−收入(收款缺口)、或整单全退(退款合计≈实付)时同样标注(退款取聚水潭已确认记录));都不满足时,若「卖家实收」或「应付/已付」能对上账单,差额按 0 计并在「匹配原因」列标注口径核对;其余标「差额待核实」。「匹配原因」单独一列,取值:账单无单号 / 账单无单号(采销收款)/ 单号格式异常 / 订单表无此单 / 1688采销收款(非销售单)/ 订单无实付金额 / 无收款账单(「采销收款」两档专指「支付宝-1688采销专用」账户:该账户收的是采销/供货结算款,不是店铺销售单收款,不按丢单处理)。',
'description' => '覆盖店铺收款账户账单各平台页签(总账备注=订单收入),按「店铺 + 订单号」匹配订单侧商品金额与订单实付金额;一行 = 一个店铺的一个订单,商品金额只挂一次。「商品金额」按「主单(拆单子单不参与)→ 原单行(merge_so_id 为空)→ 全部行」优先级取数,合单发货(原单与合并行共用同一线上单号、没有主单)时只取本单原单行,避免把合并的另一单算进来;并排除虚拟条码(X0000x:信誉订单 / 虚拟订单)明细行;「订单实付金额」取订单级实付(同一套优先级,末档兜底取该单号下最大值)再减去虚拟条码行实付。「优惠金额」「冲减金额」另取总账备注=优惠收入 / 冲减收入的账单金额,不计入收入金额;「退款金额」另取总账备注=退款的账单金额,只单独列示,不计入收入金额、也不参与差额;「种菜金额」是订单号在种菜明细表或聚水潭订单标签明细(是否种菜订单=是)任意一边出现过时,该订单的收入金额(两个条件是或的关系),只是收入金额里的一部分,不参与差额;差额=(收入金额+优惠金额+冲减金额)−订单实付金额,匹配状态与差额异常备注同样按订单实付金额判定,未匹配到订单实付金额的行按订单实付金额=0 计入差额,只反映真正对不上的部分。挂不到订单行的优惠/冲减会补成一行(收入/商品留空)。「差额异常备注」只说明差额为什么产生,按顺序自动判定:订单实付未匹配(未匹配到订单实付金额,具体原因看「匹配原因」列);订单实付取数为0(种菜)(订单实付=0 且是种菜单)、订单实付取数为0(订单实付=0 但不是种菜单)、订单实付未减联合营销费(仅得物负差额:联合营销费未让利尾数对上才标注)、订单实付取供货价(仅京喜正差额:差额=该单直营服务费(供货模式净收)时标注)、差额=直营补贴款(待开票结算)(仅京喜账单·京喜自营工厂店负差额且无退款(出类拔萃等 10 家已逐店核验,其余工厂店按实付≈商品金额的供货价特征识别):京东直营补贴款待开票结算时标注)、差额=直营补贴款(订单退款已冲回)(同批店负差额但订单已退款:补贴款已随退款冲回)、差额=订单实付包含商家承担优惠和以旧换新国补(仅京东账单·索菲亚客厅/办公/书房/功能、亿家达全屋、朴美家居店负差额、且该单含国补(聚水潭应付−账单收入>0):差额为商家承担优惠(店铺东券/单品折扣等)与以旧换新国补之和,已用营销对账逐单核实)、差额=订单实付包含商家承担优惠(同店负差额但不含国补的单:差额即商家承担优惠)、订单实付未减冲减(订单实付=收入+优惠 → 差额=冲减金额)、订单实付未减优惠(订单实付=收入+冲减 → 差额=优惠金额)、订单实付未减优惠和冲减(订单实付=收入 → 差额=优惠+冲减)(以上三档等式对带口径标识的行让位给口径兜底)、订单实付含已退款部分(抖音负差额:聚水潭退款单/取消子单金额≈差额,或退款合计+账单退款净额≈实付−收入,或整单全退(退款合计≈实付)对上才标注;淘系支付宝/微信负差额:差额=退款合计、或退款合计=实付−收入(收款缺口)、或整单全退(退款合计≈实付)时同样标注(退款取聚水潭已确认记录));以上具体规则均未命中且相关金额在 2 分钱内精确对平时,退款及其与优惠/冲减的组合复用「订单实付含已退款部分」,优惠与冲减组合复用「订单实付未减优惠和冲减」,不新增同义备注;没有可复用的原备注时继续标「差额待核实」。都不满足时,若「卖家实收」或「应付/已付」能对上账单,差额按 0 计并在「匹配原因」列标注口径核对;其余标「差额待核实」。「匹配原因」单独一列,取值:账单无单号 / 账单无单号(采销收款)/ 单号格式异常 / 订单表无此单 / 1688采销收款(非销售单)/ 订单无实付金额 / 无收款账单(「采销收款」两档专指「支付宝-1688采销专用」账户:该账户收的是采销/供货结算款,不是店铺销售单收款,不按丢单处理)。',
'empty' => '店铺收款匹配订单明细尚未同步,请先执行 store-receipt:order-match:sync。',
'fields' => [
['name' => 'platform', 'label' => '平台'],

View File

@ -8,6 +8,16 @@ use Tests\TestCase;
class PerformanceDifferenceRemarkTest extends TestCase
{
private function remarkLabels(): array
{
return (new ReflectionMethod(Pages::class, 'receiptDifferenceRemarkLabels'))->invoke(null);
}
private function baseRules(): array
{
return (new ReflectionMethod(Pages::class, 'receiptDifferenceRemarkBaseRules'))->invoke(null);
}
private function remark(array $attributes): ?string
{
$row = (object) array_merge([
@ -68,4 +78,97 @@ class PerformanceDifferenceRemarkTest extends TestCase
'difference' => 30.00,
]));
}
public function test_combination_rules_reuse_existing_labels(): void
{
$labels = $this->remarkLabels();
$rules = $this->baseRules();
$this->assertContains('订单实付含已退款部分', $labels);
$this->assertContains('订单实付未减优惠和冲减', $labels);
$this->assertStringContainsString('refund_amount', $rules['订单实付含已退款部分']);
$this->assertStringContainsString('discount_amount', $rules['订单实付未减优惠和冲减']);
$this->assertStringContainsString('offset_amount', $rules['订单实付未减优惠和冲减']);
$this->assertArrayNotHasKey('差额含已退款部分', $rules);
$this->assertArrayNotHasKey('差额含优惠/冲减项', $rules);
$this->assertArrayNotHasKey('差额=退款金额(金额对平)', $rules);
$this->assertArrayNotHasKey('差额=优惠+冲减(金额对平)', $rules);
$this->assertArrayNotHasKey('订单实付含已退款部分(金额对平)', $rules);
$this->assertArrayNotHasKey('订单实付未减优惠和冲减(金额对平)', $rules);
$this->assertArrayNotHasKey('订单实付含退款、优惠和冲减(金额对平)', $rules);
$this->assertArrayNotHasKey('订单实付含种菜收入(金额对平)', $rules);
$this->assertArrayNotHasKey('差额=小额尾差', $rules);
}
public function test_planting_income_does_not_create_a_new_difference_remark(): void
{
$this->assertSame('差额待核实', $this->remark([
'platform' => '得物',
'income_amount' => 458.80,
'planting_amount' => 458.80,
'product_amount' => 220.00,
'paid_amount' => 120.80,
'difference' => 338.00,
]));
}
public function test_refund_difference_requires_the_refund_amount_to_reconcile(): void
{
$this->assertSame('订单实付含已退款部分', $this->remark([
'platform' => '京东账单',
'store_name' => '京东-普通旗舰店',
'income_amount' => 100.00,
'refund_amount' => -19.00,
'product_amount' => 119.00,
'paid_amount' => 119.00,
'difference' => -19.00,
]));
}
public function test_discount_or_offset_difference_requires_the_amounts_to_reconcile(): void
{
$this->assertSame('订单实付未减优惠和冲减', $this->remark([
'platform' => '得物',
'income_amount' => 100.00,
'discount_amount' => -10.00,
'offset_amount' => -29.00,
'product_amount' => 150.00,
'paid_amount' => 129.00,
'difference' => -39.00,
]));
}
public function test_refund_discount_combination_requires_all_amounts_to_reconcile(): void
{
$this->assertSame('订单实付含已退款部分', $this->remark([
'platform' => '得物',
'income_amount' => 100.00,
'discount_amount' => -10.00,
'refund_amount' => -19.00,
'product_amount' => 129.00,
'paid_amount' => 129.00,
'difference' => -29.00,
]));
}
public function test_refund_or_discount_cooccurrence_alone_stays_pending(): void
{
$this->assertSame('差额待核实', $this->remark([
'platform' => '得物',
'income_amount' => 100.00,
'discount_amount' => -10.00,
'refund_amount' => -19.00,
'product_amount' => 150.00,
'paid_amount' => 129.00,
'difference' => -39.00,
]));
$this->assertSame('差额待核实', $this->remark([
'platform' => '得物',
'income_amount' => 99.50,
'product_amount' => 100.00,
'paid_amount' => 100.00,
'difference' => -0.50,
]));
}
}