Merge branch 'refs/heads/test_exp_fortune' into test

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ExpectedFortuneServiceImpl.java

@@ -192,9 +192,6 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
         expectedFortuneList.clear();
         expectedFortuneList.clear();
         expectedFortuneList.addAll(sortedList);
         expectedFortuneList.addAll(sortedList);
 
 
-        // 8. 根据 payableNo 排序
-        expectedFortuneList.sort(Comparator.comparing(ApiExpectedFortunePageResponse::getPayableNo));
-
         log.info("顺序调整后: {}", sortedList.size());
         log.info("顺序调整后: {}", sortedList.size());
     }
     }
 
 

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -383,7 +383,7 @@
             </if>
             </if>
         </where>
         </where>
 
 
-        ORDER BY payable_no ASC, type ASC
+        ORDER BY fortune_type ASC, type ASC
     </select>
     </select>
 
 
     <select id="queryListStatistics" resultType="com.yd.csf.service.vo.ExpectedFortuneStatisticsVO">
     <select id="queryListStatistics" resultType="com.yd.csf.service.vo.ExpectedFortuneStatisticsVO">