From f8cf7c1aa9c4aa094f8276e34b53ac8cb9c9b023 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Aug 2026 22:21:35 +0800
Subject: [PATCH] 11

---
 .../com/bsd/pjcloud/hard/mapper/order/HardCarMapper.java | 2 +-
 .../src/main/resources/mapper/order/HardCarMapper.xml    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardCarMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardCarMapper.java
index 26a42a9f3..e5fbe1cf0 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardCarMapper.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardCarMapper.java
@@ -96,7 +96,7 @@ public interface HardCarMapper extends PjcloudBaseMapper<HardCarEntity> {
      *
      * @param page 分页参数
      * @param dto 单日、来源、食堂、餐段、部门和商品名称筛选
-     * @return 按商品聚合的来源明细页
+     * @return 按商品名称、商品 ID、统计日期和来源升序排列的商品聚合明细页
      */
     Page<HardCarVo> proudctQueryStats(Page page, @Param("dto") HardCarDto dto);
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 282afedb9..78fe0bb98 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -973,10 +973,10 @@
             </if>
         </where>
         group by a.product_id
-        order by a.product_name asc, o.order_type asc, o.hour_type asc, SUM(a.product_count) desc
+        order by a.product_id desc, o.order_type asc, o.hour_type asc, SUM(a.product_count) desc
     </select>
 
-    <!-- 新版菜品明细按来源查询，供主表“菜品详情”弹窗使用。 -->
+    <!-- 新版菜品明细按来源查询，供主表“菜品详情”弹窗使用，并按商品名称升序稳定展示。 -->
     <select id="proudctQueryStats" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCarVo">
         select sale_stats.product_id,
                sale_stats.product_name,
@@ -995,7 +995,10 @@
         </where>
         group by sale_stats.stat_date, sale_stats.sale_source, sale_stats.product_id,
                  sale_stats.product_name, sale_stats.product_pic, sale_stats.product_price
-        order by SUM(sale_stats.product_count) desc
+        order by sale_stats.product_name asc,
+                 sale_stats.product_id asc,
+                 sale_stats.stat_date asc,
+                 sale_stats.sale_source asc
     </select>
 
     <select id="proudctMchQuery" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCarVo">