合并远程分支，解决房产模块排序功能冲突

src/test/java/com/gxwebsoft/house/util/SortSceneUtilManualTest.java

@@ -0,0 +1,38 @@
+package com.gxwebsoft.house.util;
+
+/**
+ * SortSceneUtil手动测试类
+ * 用于验证URL解码功能
+ * 
+ * @author 科技小王子
+ * @since 2025-08-04
+ */
+public class SortSceneUtilManualTest {
+    
+    public static void main(String[] args) {
+        // 测试URL编码的参数
+        String urlEncoded = "%E4%BB%B7%E6%A0%BC(%E4%BD%8E-%E9%AB%98)";
+        System.out.println("原始URL编码参数: " + urlEncoded);
+        
+        String result = SortSceneUtil.normalizeSortScene(urlEncoded);
+        System.out.println("标准化后的参数: " + result);
+        System.out.println("是否为价格升序: " + SortSceneUtil.isPriceAsc(urlEncoded));
+        
+        // 测试其他格式
+        String[] testCases = {
+            "价格(低-高)",
+            "价格(高-低)",
+            "%E4%BB%B7%E6%A0%BC(%E9%AB%98-%E4%BD%8E)",
+            "最新发布",
+            "综合排序",
+            "面积(小-大)",
+            "面积(大-小)"
+        };
+        
+        System.out.println("\n=== 测试各种排序场景 ===");
+        for (String testCase : testCases) {
+            String normalized = SortSceneUtil.normalizeSortScene(testCase);
+            System.out.println("输入: " + testCase + " -> 输出: " + normalized);
+        }
+    }
+}

src/test/java/com/gxwebsoft/house/util/SortSceneUtilTest.java

@@ -0,0 +1,63 @@
+package com.gxwebsoft.house.util;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * SortSceneUtil测试类
+ * 
+ * @author 科技小王子
+ * @since 2025-08-04
+ */
+public class SortSceneUtilTest {
+
+    @Test
+    public void testNormalizeSortScene() {
+        // 测试URL编码的参数
+        String urlEncoded = "%E4%BB%B7%E6%A0%BC(%E4%BD%8E-%E9%AB%98)";
+        String result = SortSceneUtil.normalizeSortScene(urlEncoded);
+        assertEquals("价格(低-高)", result);
+        
+        // 测试已解码的参数
+        String decoded = "价格(低-高)";
+        result = SortSceneUtil.normalizeSortScene(decoded);
+        assertEquals("价格(低-高)", result);
+        
+        // 测试空值
+        result = SortSceneUtil.normalizeSortScene(null);
+        assertNull(result);
+        
+        result = SortSceneUtil.normalizeSortScene("");
+        assertNull(result);
+        
+        result = SortSceneUtil.normalizeSortScene("   ");
+        assertNull(result);
+    }
+    
+    @Test
+    public void testIsPriceAsc() {
+        assertTrue(SortSceneUtil.isPriceAsc("价格(低-高)"));
+        assertTrue(SortSceneUtil.isPriceAsc("%E4%BB%B7%E6%A0%BC(%E4%BD%8E-%E9%AB%98)"));
+        assertFalse(SortSceneUtil.isPriceAsc("价格(高-低)"));
+        assertFalse(SortSceneUtil.isPriceAsc("最新发布"));
+    }
+    
+    @Test
+    public void testIsPriceDesc() {
+        assertTrue(SortSceneUtil.isPriceDesc("价格(高-低)"));
+        assertFalse(SortSceneUtil.isPriceDesc("价格(低-高)"));
+        assertFalse(SortSceneUtil.isPriceDesc("最新发布"));
+    }
+    
+    @Test
+    public void testIsLatest() {
+        assertTrue(SortSceneUtil.isLatest("最新发布"));
+        assertFalse(SortSceneUtil.isLatest("价格(低-高)"));
+    }
+    
+    @Test
+    public void testIsComprehensive() {
+        assertTrue(SortSceneUtil.isComprehensive("综合排序"));
+        assertFalse(SortSceneUtil.isComprehensive("价格(低-高)"));
+    }
+}