From 04ce44647a770c1ef8e222dc4c28d6e376844fa2 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Thu, 5 Nov 2026 16:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=BA=90=E4=BA=A7=E5=93=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../price/oracle/TabOrderMonitorService.java  | 22 +++++++++++++++++--
 .../price/OracleUpstreamOrderMapper.xml       |  5 +++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java
index 3436f21c..151c894b 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java
@@ -1309,8 +1309,9 @@ public class TabOrderMonitorService
         vo.setTrackId(str(row, "TRACK_ID"));
         vo.setCustomerCode(str(row, "CUSTOMER_CODE"));
         vo.setCustomerName(str(row, "CUSTOMER_NAME"));
-        vo.setProductCode(str(row, "PRODUCT_CODE"));
-        vo.setProductName(str(row, "PRODUCT_NAME"));
+        // Prefer LINE_CODE / LINE_NAME (billing product); list SQL aliases them as PRODUCT_*.
+        vo.setProductCode(firstStr(row, "LINE_CODE", "PRODUCT_CODE"));
+        vo.setProductName(firstStr(row, "LINE_NAME", "PRODUCT_NAME"));
         vo.setProductFloorCode(str(row, "PRODUCT_FLOOR_CODE"));
         vo.setCountry(str(row, "COUNTRY"));
         vo.setCountryName(str(row, "COUNTRY_NAME"));
@@ -1330,6 +1331,23 @@ public class TabOrderMonitorService
         return v == null ? null : String.valueOf(v).trim();
     }
 
+    private static String firstStr(Map<String, Object> row, String... keys)
+    {
+        if (keys == null)
+        {
+            return null;
+        }
+        for (String key : keys)
+        {
+            String v = str(row, key);
+            if (StringUtils.isNotEmpty(v))
+            {
+                return v;
+            }
+        }
+        return null;
+    }
+
     private static Integer integer(Map<String, Object> row, String key)
     {
         Object v = value(row, key);
diff --git a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
index 55796df3..33d3e605 100644
--- a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
+++ b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml
@@ -123,8 +123,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.TRACK_ID,
         o.CUSTOMER_CODE,
         o.CUSTOMER_NAME,
-        o.PRODUCT_CODE,
-        o.PRODUCT_NAME,
+        <!-- List "产品" shows LINE_* (same as billing match), not PRODUCT_* floor name. -->
+        o.LINE_CODE AS PRODUCT_CODE,
+        o.LINE_NAME AS PRODUCT_NAME,
         o.PRODUCT_FLOOR_CODE,
         o.COUNTRY,
         o.COUNTRY_NAME,