From d7e324acec16d265ece3531691372d91b5839da0 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 16 Oct 2025 14:52:44 +0800
Subject: [PATCH] =?UTF-8?q?10.16=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93id=E4=B8=8E=E5=90=8D=E7=A7=B0=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java     | 1 +
 .../java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 4 ----
 src/main/resources/cashMapper/CashRefundMapper.xml                    | 2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
index b171961..0adb9aa 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
@@ -97,6 +97,7 @@ public class CashRecordDone {
     private String executorName;
     private String refundCurrency;
     private String refundAmount;
+    private String marketName;
 
     private String processInstanceId; // 流程实例ID
     private String currentTaskId; // 当前任务ID
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
index 4a0be2e..a3b192c 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
@@ -5,7 +5,6 @@ import com.example.demo.domain.vo.cash.CashCollection;
 import com.example.demo.domain.vo.cash.CashRecordDone;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.cash.CashRefundMapper;
-import com.example.demo.service.cash.MarketService;
 import com.example.demo.service.cash.RefundService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -29,13 +28,10 @@ public class CashRefundServiceImpl implements RefundService {
 
     @Autowired
     private CashRefundMapper cashRefundMapper;
-    @Autowired
-    private MarketService marketService;
     @Override
     public PageInfo<CashCollection> select(Integer pageNum, Integer pageSize,CashRecordDone cashRecordDone) {
         PageHelper.startPage(pageNum, pageSize);
 //        System.out.println(goldDetail.getMarkets());
-        cashRecordDone.setMarket(String.valueOf(marketService.getMarketById(Integer.valueOf(cashRecordDone.getMarket()))));
         List<CashCollection> list = cashRefundMapper.select(cashRecordDone);
         return new PageInfo<>(list);
     }
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index ff7bcd0..7532bc6 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -139,10 +139,12 @@
         a1.admin_name as submitterName,
         a2.admin_name as auditName,
         a3.admin_name as executorName
+        m.name as marketName,
         from cash_record cr
         left join admin a1 on submitter_id = a1.id
             left join admin a2 on audit_id = a2.id
         left join admin a3 on executor = a3.account
+        left join market m on m.id = cr.market
         <where>
              cr.order_type = 2
             <if test="status != null">