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 97c691e96..7da7b1a8f 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 @@ -30,28 +30,32 @@ - + SELECT DISTINCT + sp.id, + t.id AS tid, sp.name, sp.pic_url, t.hour_type, sp.price, - sp.category_id + sp.category_id, + sp.sort FROM canteen_daily_menu t LEFT JOIN canteen_spu sp - on t.spu_id=sp.id + ON t.spu_id = sp.id AND t.merchant_id = #{merchantId} + AND sp.category_id = #{categoryId} + AND sp.del_flag = 0 AND t.start_time = #{time} - And t.del_flag = 0 + AND t.del_flag = 0 - order by sp.sort asc + ORDER BY sp.sort ASC