Merge remote-tracking branch 'origin/milestone-20260401-现金管理四期' into milestone-20260401-现金管理四期

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;

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=")">