From d355d95687319427b09098fca00242518fef8fe2 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sat, 11 Oct 2025 15:05:05 +0800
Subject: [PATCH] =?UTF-8?q?10.11=20=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/domain/vo/cash/CashRecordDone.java    | 18 ++++++++----------
 src/main/resources/cashMapper/CashRefundMapper.xml     | 18 +++++++++---------
 2 files changed, 17 insertions(+), 19 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 0517162..ade5e7a 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
@@ -35,9 +35,9 @@ public class CashRecordDone {
     private String bankCode;
     /** 商品名称 */
     private String goodsName;
-    /** 付款币种 */
+    /** 币种 */
     private String paymentCurrency;
-    /** 付款金额 */
+    /** 金额 */
     private BigDecimal paymentAmount;
     /** 到账币种 */
     private String receivedCurrency;
@@ -51,10 +51,9 @@ public class CashRecordDone {
     private String receivedMarket;
     /** 商品数量 */
     private Integer goodsNum;
-    /** 付款时间 */
-    private LocalDateTime payTime;
-    /** 到账时间 */
-    private LocalDateTime receivedTime;
+   /** 审核人id */
+    private Integer auditId;
+    private Integer status;
     /** 提交人id */
     private Integer submitterId;
     /** 转账凭证 */
@@ -71,10 +70,6 @@ public class CashRecordDone {
     private Integer executor;
     /** 退款途径 */
     private String refundChannels;
-    /** 退款币种 */
-    private String refundCurrency;
-    /** 退款金额 */
-    private BigDecimal refundAmount;
     /** 退款日期（到天） */
     private LocalDateTime refundTime;
     /** 退款备注（执行人写） */
@@ -85,6 +80,8 @@ public class CashRecordDone {
     private LocalDateTime createTime;
     /** 更新时间 */
     private LocalDateTime updateTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date auditTime;
     @ExcelIgnore
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date startTime; // 开始时间
@@ -93,4 +90,5 @@ public class CashRecordDone {
     private Date endTime;   // 结束时间
     private String submitterName;
     private String auditName;
+    private String executorName;
 }
\ No newline at end of file
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 32c1528..3e0cf53 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -114,14 +114,16 @@ status = #{status},
             bank_code,
             goods_name,
             good_num,
+            payment_currency,
+            payment_amount,
+            audit_id,
             status,
             submitter_id,
+            voucher,
             refund_reason,
             refund_model,
             executor,
             refund_channels,
-            refund_currency,
-            refund_amount,
             refund_time,
             refund_remark,
             refund_voucher,
@@ -129,13 +131,14 @@ status = #{status},
             reject_reason,
             create_time,
             update_time,
+            audit_time,
         a1.admin_name as submitterName,
-        a2.admin_name as auditName
+        a2.admin_name as auditName,
+        a3.admin_name as executorName
         from cash_record_done
-
-
         left join admin a1 on submitter_id = a1.id
-        left join admin a2 on audit_id = a2.id
+            left join admin a2 on audit_id = a2.id
+        left join admin a3 on executor = a3.account
         <where>
             <if test="status != null">
                 status = #{status}
@@ -161,9 +164,6 @@ status = #{status},
         <if test="refundModel != null and refundModel.size>0">
             and refundModel = #{refundModel}
         </if>
-        <if test="payType != null">
-            and pay_type = #{payType}
-        </if>
             <if test="startTime != null and endTime != null">
                 and `refund_time` BETWEEN #{startTime} AND #{endTime}
             </if>