From fcdc343247244aa2d9ef8a16f6ee67f60d1bf9ad Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 9 May 2025 15:12:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=AF=8F=E6=97=A5=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/vo/ADCanteenDailyMenuListVO.java  |  5 ++
 .../mapper/CanteenDailyMenuMapper.xml         | 63 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/ADCanteenDailyMenuListVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/ADCanteenDailyMenuListVO.java
index c428ad96..3f522b01 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/ADCanteenDailyMenuListVO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/ADCanteenDailyMenuListVO.java
@@ -39,4 +39,9 @@ public class ADCanteenDailyMenuListVO {
      * 时间类型
      */
     private Integer hourType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
 }
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 e456c331..f47debe6 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
@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bsd.pjcloud.canteen.mapper.CanteenDailyMenuMapper">
-
-  <resultMap id="canteenDailyMenuMap" type="com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity">
+    <resultMap id="canteenDailyMenuMap" type="com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity">
         <id property="id" column="id"/>
         <result property="startTime" column="start_time"/>
         <result property="spuId" column="spu_id"/>
@@ -16,7 +15,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
-  </resultMap>
+    </resultMap>
 
     <resultMap id="adCanteenDailyMenuListVO" type="com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO">
         <id property="id" column="id"/>
@@ -27,28 +26,29 @@
         <result property="categoryId" column="category_id"/>
         <result property="picUrl" column="pic_url"/>
         <result property="stock" column="stock"/>
+        <result property="sort" column="sort"/>
         <result property="hourType" column="hour_type"/>
     </resultMap>
     <select id="selectTimeFood" resultType="com.bsd.pjcloud.canteen.vo.DailyMenuVO">
         SELECT
         DISTINCT(sp.id),
-            t.id as tid,
-               sp.name,
-               sp.pic_url,
-               t.hour_type,
-               sp.price,
-               sp.category_id
+        t.id as tid,
+        sp.name,
+        sp.pic_url,
+        t.hour_type,
+        sp.price,
+        sp.category_id
         FROM canteen_daily_menu t
         LEFT JOIN canteen_spu sp
         on t.spu_id=sp.id
         <where>
-          AND t.merchant_id = #{merchantId}
-               <if test="categoryId != null">
-                   AND sp.category_id = #{categoryId}
-               </if>
-          AND sp.del_flag = 0
-          AND t.start_time = #{time}
-          And t.del_flag = 0
+            AND t.merchant_id = #{merchantId}
+            <if test="categoryId != null">
+                AND sp.category_id = #{categoryId}
+            </if>
+            AND sp.del_flag = 0
+            AND t.start_time = #{time}
+            And t.del_flag = 0
         </where>
         order by sp.sort asc
     </select>
@@ -62,6 +62,7 @@
         sp.price,
         sp.stock,
         sp.category_id,
+        sp.sort,
         t.dept_id,
         t.create_by
         FROM canteen_daily_menu t
@@ -83,22 +84,23 @@
             </if>
         </where>
     </select>
-    <select id="selectTimeFoodPage" resultType="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO" parameterType="com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO">
+    <select id="selectTimeFoodPage" resultType="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO"
+            parameterType="com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO">
         SELECT m.id,
-               m.hour_type,
-               s.id as spu_id,
-               s.`name`,
-               s.price,
-               s.stock,
-               s.pic_url,
-               s.sort,
-               s.is_show,
-               c.id as category_id
+        m.hour_type,
+        s.id as spu_id,
+        s.`name`,
+        s.price,
+        s.stock,
+        s.pic_url,
+        s.sort,
+        s.is_show,
+        c.id as category_id
         FROM `canteen_daily_menu` m
-                 left JOIN canteen_spu s
-                           on m.spu_id = s.id
-                 LEFT JOIN canteen_category c
-                           on s.category_id = c.id
+        left JOIN canteen_spu s
+        on m.spu_id = s.id
+        LEFT JOIN canteen_category c
+        on s.category_id = c.id
         <where>
             m.del_flag = 0 and s.del_flag = 0 and m.merchant_id = #{dailyMenuDTO.merchantId} and s.is_show = 0
             <if test="dailyMenuDTO.startTime != null">
@@ -112,6 +114,5 @@
             </if>
         </where>
         order by s.sort asc
-
     </select>
 </mapper>
\ No newline at end of file