From e52206e6d810dfc6e365ccf2fb2f663cf2dafe3e Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 19 Jul 2024 13:46:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=82=B9=E6=AD=8C=E8=AE=B0=E5=BD=95=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/dao/TbShopSongOrderMapper.java | 4 ++-- .../cashierservice/service/impl/TbShopSongServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java index 8664534..7c461ed 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java @@ -67,6 +67,6 @@ public interface TbShopSongOrderMapper { @Select("SELECT a.song_name songName, a.id, b.img FROM `tb_shop_song_order` as a left join tb_shop_song as b on a.song_id=b.id where state=2 limit 1") Map selectSinging(); - @Select("select id from tb_shop_song_order where state=1 or state=2 order by create_time asc") - List selectWaitAll(); + @Select("select id from tb_shop_song_order where (state=1 or state=2) and shop_id=#{id} order by create_time asc") + List selectWaitAll(@Param("id") Integer shopId); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopSongServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopSongServiceImpl.java index 1e3f16a..805e56d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopSongServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopSongServiceImpl.java @@ -79,7 +79,7 @@ public class TbShopSongServiceImpl implements TbShopSongService{ } LinkedHashMap rank = new LinkedHashMap<>(); - List tbShopSongOrders = shopSongOrderMapper.selectWaitAll(); + List tbShopSongOrders = shopSongOrderMapper.selectWaitAll(shopId); for (int i = 0; i < tbShopSongOrders.size(); i++) { rank.put(tbShopSongOrders.get(i).getId().toString(), i); }