From 743c0250bb3658ab54851b25dd04e5aba1eeefeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Thu, 19 Feb 2026 08:25:22 +0900 Subject: [PATCH] =?UTF-8?q?fix:=EB=8B=A8=EC=B2=B4=20=ED=8C=8C=ED=8A=B8?= =?UTF-8?q?=EB=84=88=20=EC=88=98=EB=8B=B9=20=EA=B3=84=EC=82=B0=20=EC=9A=94?= =?UTF-8?q?=EC=9C=A8=20=EC=88=98=EC=A0=95=20(15%=E2=86=9230%,=2010%?= =?UTF-8?q?=E2=86=9220%)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 기존: 개발비 × 50% × 요율로 미리 반감 후 또 50% 분할 → 이중 반감 오류 수정: 개발비 × 요율(개인 20%, 단체 30%)로 계산, 1차/2차 분할은 별도 처리 Co-Authored-By: Claude Opus 4.6 --- app/Http/Controllers/Sales/SalesDashboardController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Sales/SalesDashboardController.php b/app/Http/Controllers/Sales/SalesDashboardController.php index 6071f138..50eb34de 100644 --- a/app/Http/Controllers/Sales/SalesDashboardController.php +++ b/app/Http/Controllers/Sales/SalesDashboardController.php @@ -179,8 +179,8 @@ private function getDashboardData(Request $request): array $handoverTotalRegFee = SalesContractProduct::whereIn('management_id', $handoverManagementIds) ->sum('registration_fee'); - // 수당 계산: 개발비 × 50% × 요율% (개인 20% → 10%, 단체 30% → 15%) - $handoverPartnerRate = $isGroupPartner ? 0.15 : 0.10; + // 수당 계산: 개발비 × 요율% (개인 20%, 단체 30%) - 1차/2차 분할은 calculateExpectedCommissionSummary에서 처리 + $handoverPartnerRate = $isGroupPartner ? 0.30 : 0.20; $handoverPartnerCommission = (int)($handoverTotalRegFee * $handoverPartnerRate); // 내가 매니저로 지정된 인계 완료 건의 수당 계산 @@ -278,7 +278,7 @@ private function getDashboardData(Request $request): array ->toArray(); $devInProgressRegFee = SalesContractProduct::whereIn('management_id', $devInProgressManagementIds) ->sum('registration_fee'); - $expectedFromDevInProgress = (int)($devInProgressRegFee * $handoverPartnerRate); // 개발비 × 요율 (개인 10%, 단체 15%) + $expectedFromDevInProgress = (int)($devInProgressRegFee * $handoverPartnerRate); // 개발비 × 요율 (개인 20%, 단체 30%) // 2) 인계 완료 중 지급 미완료 건 $handoverUnpaidRegFee = SalesContractProduct::whereIn('management_id', $handoverManagementIds)