From e37429843bd8e604f216fb40e397e3c161d82079 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Fri, 17 Oct 2025 10:45:07 +0800
Subject: [PATCH] =?UTF-8?q?10-17=20=E6=94=B6=E6=AC=BE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=88=E4=B8=89=E4=B8=AA=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapper/coin/MarketMapper.java          | 2 ++
 .../com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java  | 4 ++++
 src/main/resources/mapper/MarketMapper.xml                            | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java
index 6377f7a..a40934f 100644
--- a/src/main/java/com/example/demo/mapper/coin/MarketMapper.java
+++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java
@@ -9,4 +9,6 @@ public interface MarketMapper {
 
     //获取市场id
     List<String> getMarketIds(List<String> list);
+    //获取单个市场id
+    String getMarketId(String market);
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
index 94f924d..d1691d7 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -175,9 +175,13 @@ public class CashCollectionServiceImpl implements CashCollectionService {
         if (markets.contains("9") || markets.contains("9999")){
             markets=null;
         }
+        cashCollection.setReceivedMarket(marketMapper.getMarketId(cashCollection.getReceivedMarket()));
         if (cashCollection.getCashRoleId()==2)
         {
             cashCollection.setStatus(134);
+            cashCollection.setSubmitterId(null);
+        }if (cashCollection.getCashRoleId()==1){
+            cashCollection.setSubmitterId(null);
         }
         cashCollection.setMarkets(markets);
         PageHelper.startPage(pageNum, pageSize);
diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml
index 5ed1af2..eb6e58a 100644
--- a/src/main/resources/mapper/MarketMapper.xml
+++ b/src/main/resources/mapper/MarketMapper.xml
@@ -26,4 +26,7 @@
         </foreach>
         )
     </select>
+    <select id="getMarketId" resultType="java.lang.String">
+        select id from market where name=#{market}
+    </select>
 </mapper>
\ No newline at end of file