From 2dde58dfb3ac4e1824fc864142d1d5dc1f132570 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 16 Oct 2025 13:53:06 +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

---
 .../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java    | 4 ++++
 src/main/resources/cashMapper/CashRecordMapper.xml                  | 5 -----
 src/main/resources/cashMapper/CashRefundMapper.xml                  | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 src/main/resources/cashMapper/CashRecordMapper.xml

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 a3b192c..4a0be2e 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
@@ -5,6 +5,7 @@ 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;
@@ -28,10 +29,13 @@ 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/CashRecordMapper.xml b/src/main/resources/cashMapper/CashRecordMapper.xml
deleted file mode 100644
index 3a018e2..0000000
--- a/src/main/resources/cashMapper/CashRecordMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.cash.CashRecordMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 6aaa514..ff7bcd0 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -81,11 +81,11 @@
     </update>
     <update id="withdraw">
         update cash_record set status = 11
-        where order_code =2 and id = #{id}
+        where order_type =2 and id = #{id}
     </update>
     <update id="review">
         update cash_record set status = #{status},executor = #{executor},reject_reason = #{rejectReason}
-        where order_code =2 and id = #{id}
+        where order_type =2 and id = #{id}
     </update>
     <update id="executor">
         update cash_record set refund_currency = #{refundCurrency},
@@ -95,7 +95,7 @@
                                refund_remark = #{refundRemark},
                                refund_voucher = #{refundVoucher},
                                status = #{status}
-        where order_code =2 and id = #{id}
+        where order_type =2 and id = #{id}
     </update>