fix:每日菜谱排序和消费机排序一致

This commit is contained in:
dzc committed 2026-10-14 16:58:58 +08:00
1 parent 66be2c3ad2
commit 8f303f1c63
1 file changed
+4 -2
@@ -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">