diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopSongController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopSongController.java index 15e1f60..c5f1065 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopSongController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopSongController.java @@ -60,6 +60,13 @@ public class ShopSongController { return Result.successWithData(shopSongService.getRecord(openId, page, size, state, isDesc)); } + @GetMapping("/singing") + public Result getSinging( + @RequestHeader("openId") String openId + ) { + return Result.successWithData(shopSongService.getSinging(openId)); + } + @PostMapping public Result createOrder( 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 51fc372..134dc52 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java @@ -63,4 +63,7 @@ public interface TbShopSongOrderMapper { " WHERE\n" + " a.open_id = #{openId} and a.state in (1, 2, 3)") List> selectActiveOrderByUserId(@Param("openId") String openId); + + @Select("SELECT song_name, id FROM `tb_shop_song_order` where open_id=#{openId} and state=2 limit 1") + Map selectSinging(@Param("openId") String openId); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopSongService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopSongService.java index ae7c93d..a427ff8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopSongService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/TbShopSongService.java @@ -44,4 +44,11 @@ public interface TbShopSongService { * @return 订单信息 */ Map getDetail(String openId, Integer id); + + /** + * 正在演唱的歌曲 + * @param openId 用户id + * @return 歌曲信息 + */ + Object getSinging(String openId); } 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 fc3c606..5033b5f 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 @@ -133,6 +133,11 @@ public class TbShopSongServiceImpl implements TbShopSongService{ } return map; } + + @Override + public Object getSinging(String openId) { + return shopSongOrderMapper.selectSinging(openId); + } }