From 5678930e2348ca4a583f93a92a66406c6fcde303 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Wed, 22 Oct 2025 13:45:42 +0800
Subject: [PATCH] =?UTF-8?q?10.20=20=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/cash/CashRefundController.java        | 15 +++++++++++++++
 .../com/example/demo/domain/vo/cash/CashRecordDone.java   |  2 ++
 src/main/resources/cashMapper/CashCollectionMapper.xml    |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/controller/cash/CashRefundController.java b/src/main/java/com/example/demo/controller/cash/CashRefundController.java
index 6c379e2..c0d2fe4 100644
--- a/src/main/java/com/example/demo/controller/cash/CashRefundController.java
+++ b/src/main/java/com/example/demo/controller/cash/CashRefundController.java
@@ -95,7 +95,22 @@ public class CashRefundController {
             return Result.error(e.getMessage());
         }
     }
+    @PostMapping("/selecta")
+    public Result selecta(@RequestBody Page page) {
 
+
+// 校验分页参数
+        if (ObjectUtils.isEmpty(page.getPageNum())) {
+            return Result.error("页码数为空！");
+        }
+        if (ObjectUtils.isEmpty(page.getPageSize())) {
+            return Result.error("页大小为空！");
+        }
+// 获取传入的市场列表
+        List<String> requestedMarkets = page.getCashRecordDone() != null ? page.getCashRecordDone().getMarkets() : null;
+
+        return Result.success(refundService.select(page.getPageNum(), page.getPageSize(), page.getCashRecordDone()));
+    }
     @PostMapping("/update")
     public Result update(@RequestBody CashRecordDone cashRecordDone) {
         if (cashRecordDone.getStatus() == 10) {
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 928eafd..b394a4d 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
@@ -111,6 +111,8 @@ public class CashRecordDone {
     private String areaFinance;
     private String areaCharge;
     private String headFinance;
+    private String sortField;
+    private String sortOrder;
 
 
 }
\ No newline at end of file
diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index a9d8cce..32ca2ce 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -9,7 +9,7 @@
             cash_record(order_type,jwcode,name,market,activity,
                             order_code,goods_name,good_num,permanent_gold,free_gold,
                             payment_currency,payment_amount,received_market,
-                            pay_type,pay_time,status,submitter_id,submtter_market,
+                            pay_type,pay_time,status,submitter_id,submitter_market,
                             voucher,remark)
         values(#{orderType},#{jwcode},#{name},#{market},#{activity},
                #{orderCode},#{goodsName},#{goodNum},#{permanentGold},#{freeGold},#{paymentCurrency},