From 8f303f1c63ea23f1d2f241e5e0c788ef0256064a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 14 Oct 2026 16:58:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=AF=8F=E6=97=A5=E8=8F=9C?=
 =?UTF-8?q?=E8=B0=B1=E6=8E=92=E5=BA=8F=E5=92=8C=E6=B6=88=E8=B4=B9=E6=9C=BA?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CanteenDailyMenuMapper.xml    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
index 4ab548920..0c7e3b47e 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
@@ -131,7 +131,8 @@
                 AND t.merchant_id = #{merchantId}
             </if>
         </where>
-        order by sp.sort asc
+        <!-- 与管理端列表默认排序同口径（sort 升序 + 餐段 + 菜谱行 ID），补齐并列键让消费机收银菜单顺序与 PC 列表管理一致且稳定 -->
+        order by sp.sort asc, t.hour_type asc, t.id asc
     </select>
 
 	<!-- 下单复核专用：无 DataScope；与 App 一致要求 is_show=0 -->
@@ -225,7 +226,8 @@
             </if>
             AND t.merchant_id = #{request.merchantId}
         </where>
-        order by t.start_time asc, t.hour_type asc, sp.sort asc
+        <!-- 末位补 t.id 并列键：同日同餐段同 sort 时按菜谱行插入顺序稳定输出，消费机按日期范围同步后仍与 PC 列表管理一致 -->
+        order by t.start_time asc, t.hour_type asc, sp.sort asc, t.id asc
     </select>
     <select id="selectTimeFoodPage" resultType="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO"
             parameterType="com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO">