小程序点歌 点歌记录增加shopId

This commit is contained in:
2024-07-16 11:35:33 +08:00
parent e785ee6467
commit 50ec8c7cd7
4 changed files with 10 additions and 9 deletions

View File

@@ -25,7 +25,7 @@ public interface TbShopSongService {
*/
PageInfo<?> all(Integer shopId, Integer page, Integer size, String keyWord, boolean isDesc);
Object getRecord(String openId, Integer page, Integer size, Integer state, boolean isDesc);
Object getRecord(String openId, Integer page, Integer size, Integer state, boolean isDesc, Integer shopId);
/**
* 创建订单

View File

@@ -68,13 +68,13 @@ public class TbShopSongServiceImpl implements TbShopSongService{
}
@Override
public Object getRecord(String openId, Integer page, Integer size, Integer state, boolean isDesc) {
public Object getRecord(String openId, Integer page, Integer size, Integer state, boolean isDesc, Integer shopId) {
PageHelper.startPage(page, size);
List<Map<String, Object>> songOrders;
if (state == null) {
songOrders = shopSongOrderMapper.selectActiveOrderByUserId(openId);
songOrders = shopSongOrderMapper.selectActiveOrderByUserId(openId, shopId);
}else {
songOrders = shopSongOrderMapper.selectByUserId(openId, state);
songOrders = shopSongOrderMapper.selectByUserId(openId, state, shopId);
}
LinkedHashMap<String, Integer> rank = new LinkedHashMap<>();