From 0ab14a89e9079cad9f5c5d286306f03c429a9090 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Thu, 2 Apr 2026 14:04:41 +0800
Subject: [PATCH] =?UTF-8?q?04-02=20=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E8=B4=A6=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=9A=E7=BB=A9=E5=BD=92=E5=B1=9E=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/domain/vo/cash/FundsDTO.java  | 36 +++++++++++++++-------
 src/main/resources/application-test.yml            |  6 ++--
 src/main/resources/cashMapper/CashRefundMapper.xml | 11 +++++++
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
index 295f683..778358a 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
@@ -23,27 +23,41 @@ import java.util.List;
 @NoArgsConstructor
 public class FundsDTO {
     private Integer id;
-    private Integer jwcode;
+    @ExcelIgnore
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date payTime;
+    private String orderCode;
+    private String receivedMarket;      //到账地区
+    private String performanceMarket;   //业绩归属地区
     private String name;
+    private Integer jwcode;
+    private String incomeType;      //收入类别
+    private String remark;          //备注
+    private Integer goodNum;        //商品数量
+    private String payType;
+    @ExcelIgnore
+    private Integer receivedCurrency;
+    private BigDecimal paymentAmount;
+    private BigDecimal handlingCharge;
+    private BigDecimal receivedAmount;
     @ExcelIgnore
     private Integer market;
     private String marketName;
     @ExcelIgnore
     private List<String> markets;
-    private String orderCode;
+    @ExcelIgnore
+    private List<String> performanceMarkets;
+
     @ExcelIgnore
     private Integer paymentCurrency;
     private String paymentCurrencyName;
-    private BigDecimal paymentAmount;
-    @ExcelIgnore
-    private Integer receivedCurrency;
+
+
     private String receivedCurrencyName;
-    private BigDecimal receivedAmount;
-    private BigDecimal handlingCharge;
-    private String payType;
-    @ExcelIgnore
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
-    private Date payTime;
+
+
+
+
     @ExcelIgnore
     private Integer status;
     private String statusName;
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 90ae516..30339e7 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -81,9 +81,9 @@ spring:
   data:
     redis:
       database: 0
-      host: localhost
-      port: 6379
-      password: 123456
+      host: 54.255.212.181
+      port: 10703
+      password: Ngc0FYUTA6h3wC5J
 
       lettuce:
         pool:
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 98c62e0..724ad84 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -449,6 +449,11 @@
         SELECT
         crc.id,
         crc.jwcode,
+        crc.income_type,
+        crc.remark,
+        crc.good_num,
+        crc.performance_market,
+        crc.received_market,
         crc.name,
         crc.market,
         crc.order_code,
@@ -476,6 +481,12 @@
                 #{markets}
             </foreach>
         </if>
+        <if test="performanceMarkets!= null and performanceMarkets.size > 0">
+            AND crc.performance_market IN
+            <foreach collection="performanceMarkets" item="performanceMarkets" open="(" separator="," close=")">
+                #{performanceMarkets}
+            </foreach>
+        </if>
         <if test="localMarket != null and localMarket.size > 0">
             AND crc.market IN
             <foreach collection="localMarket" item="localMarket" open="(" separator="," close=")">