From 719d578a9ccc6023aad67af3829b8f5d63216e64 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 11 Jul 2024 11:45:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E4=B8=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/TbShopOpenIdMapper.java  |  4 ++--
 .../cashierservice/dao/TbShopSongOrderMapper.java      | 10 +++++++++-
 .../service/impl/TbShopSongServiceImpl.java            |  7 ++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopOpenIdMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopOpenIdMapper.java
index 1ddc42a..20f32d9 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopOpenIdMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopOpenIdMapper.java
@@ -26,8 +26,8 @@ public interface TbShopOpenIdMapper {
 
     int updateByPrimaryKey(TbShopOpenId record);
 
-    @Select("select * from tb_shop_open_id where open_id=#{openId}")
-    TbShopOpenId countByOpenId(@Param("openId") String openId);
+    @Select("select * from tb_shop_open_id where open_id=#{openId} and shop_id=#{shopId}")
+    TbShopOpenId countByOpenId(@Param("openId") String openId, @Param("shopId") Integer shopId);
 
     @Select("select * from tb_shop_open_id where shop_id=#{shopId} and status=1")
     List<TbShopOpenId> selectByShopId(@Param("shopId") Integer shopId);
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 9634a95..51fc372 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
@@ -34,7 +34,7 @@ public interface TbShopSongOrderMapper {
             "            tb_shop_song_order AS a\n" +
             "                LEFT JOIN tb_shop_song AS b ON a.song_id = b.id\n" +
             "        WHERE\n" +
-            "            a.open_id = #{openId}\n" +
+            "            a.open_id = #{openId} " +
             "          <if test=\"state!=null\">AND a.state = #{state}</if></script>")
     List<Map<String, Object>> selectByUserId(@Param("openId") String openId, @Param("state") Integer state);
 
@@ -55,4 +55,12 @@ public interface TbShopSongOrderMapper {
             "WHERE create_time < NOW() - INTERVAL 10 MINUTE AND state=-1;\n")
     int deleteExpireOrder();
 
+    @Select("SELECT\n" +
+            "            b.img, b.name, b.origin_singer originSinger, b.price, a.from_name fromName, a.to_name toName, a.note\n" +
+            "        FROM\n" +
+            "            tb_shop_song_order AS a\n" +
+            "                LEFT JOIN tb_shop_song AS b ON a.song_id = b.id\n" +
+            "        WHERE\n" +
+            "            a.open_id = #{openId} and a.state in (1, 2, 3)")
+    List<Map<String, Object>> selectActiveOrderByUserId(@Param("openId") 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 a32452c..fc3c606 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
@@ -72,7 +72,12 @@ public class TbShopSongServiceImpl implements TbShopSongService{
     @Override
     public Object getRecord(String openId, Integer page, Integer size, Integer state, boolean isDesc) {
         PageHelper.startPage(page, size);
-        List<Map<String, Object>> songOrders = shopSongOrderMapper.selectByUserId(openId, state);
+        List<Map<String, Object>> songOrders;
+        if (state == null) {
+            songOrders = shopSongOrderMapper.selectActiveOrderByUserId(openId);
+        }else {
+            songOrders = shopSongOrderMapper.selectByUserId(openId, state);
+        }
 
         ArrayList<Map<String, Object>> infos = new ArrayList<>();
         for (int i = 0; i < songOrders.size(); i++) {