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 @@ - - + @@ -16,7 +15,7 @@ - + @@ -27,28 +26,29 @@ + @@ -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 @@ - 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 m.del_flag = 0 and s.del_flag = 0 and m.merchant_id = #{dailyMenuDTO.merchantId} and s.is_show = 0 @@ -112,6 +114,5 @@ order by s.sort asc - \ No newline at end of file