diff --git a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml index 08b446688..4a456a230 100644 --- a/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/KitchenDetailMapper.xml @@ -38,7 +38,16 @@ AND detail.product_name like concat('%',#{productName},'%') - GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.place_num + GROUP BY `order`.id, detail.product_id, detail.sku_id, detail.id + ORDER BY + CASE detail.sub_status + WHEN 'READY_TO_SERVE' THEN 1 + WHEN 'PENDING_PREP' THEN 2 + WHEN 'SENT_OUT' THEN 3 + WHEN 'DELIVERED' THEN 4 + ELSE 5 + END ASC, + CASE WHEN detail.sub_status = 'READY_TO_SERVE' THEN detail.start_order_time END ASC