From 37fb8e55c1f7d7055776a0ba71b1ea9275e4e116 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 12 Jul 2024 18:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=82=B9=E6=AD=8C?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E5=BE=85=E6=BC=94=E5=94=B1=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/dao/TbShopSongOrderMapper.java   |  7 +++++--
 .../service/impl/TbShopSongServiceImpl.java         | 13 ++++++++-----
 2 files changed, 13 insertions(+), 7 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 5bd5820..3c11ec4 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopSongOrderMapper.java
@@ -29,7 +29,7 @@ public interface TbShopSongOrderMapper {
     int updateByPrimaryKey(TbShopSongOrder record);
 
     @Select("<script>SELECT\n" +
-            "            b.img, b.name, b.origin_singer originSinger, b.price, a.from_name fromName, a.to_name toName, a.note\n" +
+            "            a.id orderId, 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" +
@@ -56,7 +56,7 @@ public interface TbShopSongOrderMapper {
     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" +
+            "            a.id orderId,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" +
@@ -66,4 +66,7 @@ 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 open_id=#{openId} and state=2 limit 1")
     Map<String, Object> selectSinging(@Param("openId") String openId);
+
+    @Select("select id from tb_shop_song_order where state=1 or state=2 order by create_time asc")
+    List<TbShopSongOrder> selectWaitAll();
 }
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 d801d64..652f50d 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
@@ -27,10 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
 * @author Administrator
@@ -80,10 +77,16 @@ public class TbShopSongServiceImpl implements TbShopSongService{
             songOrders = shopSongOrderMapper.selectByUserId(openId, state);
         }
 
+        LinkedHashMap<String, Integer> rank = new LinkedHashMap<>();
+        List<TbShopSongOrder> tbShopSongOrders = shopSongOrderMapper.selectWaitAll();
+        for (int i = 0; i < tbShopSongOrders.size(); i++) {
+            rank.put(tbShopSongOrders.get(i).getId().toString(), i);
+        }
+
         ArrayList<Map<String, Object>> infos = new ArrayList<>();
         for (int i = 0; i < songOrders.size(); i++) {
             Map<String, Object> toMap = songOrders.get(i);
-            toMap.put("preCount", i);
+            toMap.put("preCount", rank.get(String.valueOf(songOrders.get(i).get("orderId"))));
             infos.add(toMap);
         }
         return new PageInfo<>(infos);