From 5f43c945f0ff51f8d50fd50720cf16e96aa6c2b6 Mon Sep 17 00:00:00 2001
From: GA Pro <ga-pro@example.com>
Date: Mon, 8 Jun 2026 21:34:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8F=99=EA=B8=B0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../installment/InstallmentRatioMapper.xml    | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/ga-core/src/main/resources/mapper/installment/InstallmentRatioMapper.xml b/ga-core/src/main/resources/mapper/installment/InstallmentRatioMapper.xml
index 55e6086..1f03826 100644
--- a/ga-core/src/main/resources/mapper/installment/InstallmentRatioMapper.xml
+++ b/ga-core/src/main/resources/mapper/installment/InstallmentRatioMapper.xml
@@ -111,17 +111,30 @@
         LIMIT 1
     </select>
 
-    <!-- 1~7년 차 전체 비율 조회 (분급 계획 일괄 생성 시 사용) -->
+    <!--
+        1~7년 차 전체 비율 조회 (분급 계획 일괄 생성 시 사용).
+        상품카테고리 일치 룰 우선, 없으면 product_category IS NULL(전 카테고리 기본)로 폴백한다.
+        (chargeback/channel NULL-우선 패턴 동일.) 각 (plan_year, plan_month) 슬롯마다 가장 구체적인
+        1건만 선택해 카테고리 부분 오버라이드 시에도 중복 합산을 방지한다.
+        — 기존 동작(NULL 매개변수 → IS NULL 행)도 그대로 보존된다.
+    -->
     <select id="selectAllActiveRatios" resultMap="VOMap">
         SELECT ratio_id, product_category, plan_year, plan_month, ratio_percent,
                effective_from, effective_to, is_active,
                created_at, created_by, updated_at, updated_by
-        FROM installment_ratio
-        WHERE (product_category = #{productCategory,jdbcType=VARCHAR}
-               OR (#{productCategory,jdbcType=VARCHAR} IS NULL AND product_category IS NULL))
-          AND is_active = TRUE
-          AND effective_from &lt;= #{baseDate}::DATE
-          AND (effective_to IS NULL OR effective_to >= #{baseDate}::DATE)
+        FROM (
+            SELECT DISTINCT ON (plan_year, plan_month)
+                   ratio_id, product_category, plan_year, plan_month, ratio_percent,
+                   effective_from, effective_to, is_active,
+                   created_at, created_by, updated_at, updated_by
+            FROM installment_ratio
+            WHERE (product_category = #{productCategory,jdbcType=VARCHAR} OR product_category IS NULL)
+              AND is_active = TRUE
+              AND effective_from &lt;= #{baseDate}::DATE
+              AND (effective_to IS NULL OR effective_to >= #{baseDate}::DATE)
+            ORDER BY plan_year, plan_month NULLS FIRST,
+                     (product_category IS NULL) ASC, effective_from DESC, ratio_id DESC
+        ) r
         ORDER BY plan_year, plan_month NULLS FIRST
     </select>