银行流水交易明细表

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/BankStatementReportController.java

@@ -5,9 +5,12 @@ import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.module.trade.controller.admin.report.vo.BankStatementReportPageReqVO;
 import com.yc.ship.module.trade.controller.admin.report.vo.BankStatementReportRespVO;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsPageReqVO;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO;
 import com.yc.ship.module.trade.controller.admin.report.vo.IncomeOrderLedgerPageReqVO;
 import com.yc.ship.module.trade.controller.admin.report.vo.IncomeOrderLedgerRespVO;
 import com.yc.ship.module.trade.service.report.BankStatementReportService;
+import com.yc.ship.module.trade.service.report.BankTransactionDetailsService;
 import com.yc.ship.module.trade.service.report.IncomeOrderLedgerService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -44,6 +47,9 @@ public class BankStatementReportController {
     @Resource
     private IncomeOrderLedgerService incomeOrderLedgerService;
 
+    @Resource
+    private BankTransactionDetailsService bankTransactionDetailsService;
+
     /**
      * 查询银行对账报表分页
      *
@@ -110,4 +116,34 @@ public class BankStatementReportController {
         incomeOrderLedgerService.exportIncomeOrderLedgerExcel(pageReqVO, response);
     }
 
+    // ==================== 银行流水交易明细接口 ====================
+
+    /**
+     * 查询银行流水交易明细分页
+     *
+     * @param pageReqVO 分页查询条件
+     * @return 分页结果
+     */
+    @GetMapping("/bank-transaction-details/page")
+    @Operation(summary = "查询银行流水交易明细分页")
+    public CommonResult<PageResult<BankTransactionDetailsRespVO>> getBankTransactionDetailsPage(@Valid BankTransactionDetailsPageReqVO pageReqVO) {
+        PageResult<BankTransactionDetailsRespVO> pageResult = bankTransactionDetailsService.getBankTransactionDetailsPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    /**
+     * 导出银行流水交易明细 Excel（数字字段导出为数字格式）
+     *
+     * @param pageReqVO 查询条件
+     * @param response  HTTP响应
+     * @throws IOException IO异常
+     */
+    @GetMapping("/bank-transaction-details/export-excel")
+    @Operation(summary = "导出银行流水交易明细 Excel")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportBankTransactionDetailsExcel(@Valid BankTransactionDetailsPageReqVO pageReqVO,
+                                                    HttpServletResponse response) throws IOException {
+        bankTransactionDetailsService.exportBankTransactionDetailsExcel(pageReqVO, response);
+    }
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/vo/BankTransactionDetailsPageReqVO.java

@@ -0,0 +1,51 @@
+package com.yc.ship.module.trade.controller.admin.report.vo;
+
+import com.yc.ship.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static com.yc.ship.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 银行流水交易明细分页查询 Request VO
+ *
+ * @author auto-generated
+ */
+@Schema(description = "管理后台 - 银行流水交易明细分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class BankTransactionDetailsPageReqVO extends PageParam {
+
+    @Schema(description = "交易时间开始", example = "2024-01-01 00:00:00")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime transactionTimeStart;
+
+    @Schema(description = "交易时间结束", example = "2024-12-31 23:59:59")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime transactionTimeEnd;
+
+    @Schema(description = "开航时间", example = "2024-03-01")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate boardDate;
+
+    @Schema(description = "订单号/账单号", example = "CJXLY-20260421-YC-45")
+    private String orderNo;
+
+    @Schema(description = "客户名称(组团社)", example = "重庆蓝波湾国际旅行社有限公司")
+    private String customerName;
+
+    @Schema(description = "支付方式", example = "1")
+    private Integer paymentMethod;
+
+    @Schema(description = "交易类型：1-支付 2-退款 3-充值 4-账单还款", example = "1")
+    private Integer transactionType;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/report/vo/BankTransactionDetailsRespVO.java

@@ -0,0 +1,54 @@
+package com.yc.ship.module.trade.controller.admin.report.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 银行流水交易明细 Response VO（同时用于 Excel 导出）
+ *
+ * @author auto-generated
+ */
+@Schema(description = "管理后台 - 银行流水交易明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class BankTransactionDetailsRespVO {
+
+    @Schema(description = "交易时间", example = "2026-02-08 15:50:07")
+    @ExcelProperty("交易时间")
+    private String transactionTime;
+
+    @Schema(description = "开航时间", example = "2026/04/21")
+    @ExcelProperty("开航时间")
+    private String boardingTime;
+
+    @Schema(description = "订单号/账单号", example = "CJXLY-20260421-YC-45")
+    @ExcelProperty("订单号/账单号")
+    private String orderNo;
+
+    @Schema(description = "组团社", example = "重庆蓝波湾国际旅行社有限公司")
+    @ExcelProperty("组团社")
+    private String travelAgencyName;
+
+    @Schema(description = "支付方式", example = "微信")
+    @ExcelProperty("支付方式")
+    private String paymentMethod;
+
+    @Schema(description = "交易类型", example = "支付")
+    @ExcelProperty("交易类型")
+    private String transactionType;
+
+    @Schema(description = "交易金额", example = "10000.00")
+    @NumberFormat("0.00")
+    @ExcelProperty("交易金额")
+    private BigDecimal amount;
+
+    @Schema(description = "银行流水号", example = "100426020818272998847032")
+    @ExcelProperty("银行流水号(抓取农行流水)")
+    private String bankSerialNo;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/report/BankTransactionDetailsMapper.java

@@ -0,0 +1,39 @@
+package com.yc.ship.module.trade.dal.mysql.report;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsPageReqVO;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 银行流水交易明细 Mapper
+ *
+ * @author auto-generated
+ */
+@Mapper
+public interface BankTransactionDetailsMapper extends BaseMapperX<BankTransactionDetailsRespVO> {
+
+    /**
+     * 分页查询银行流水交易明细
+     *
+     * @param page 分页参数
+     * @param vo   查询条件
+     * @return 分页结果
+     */
+    IPage<BankTransactionDetailsRespVO> selectBankTransactionDetailsPage(
+            IPage<BankTransactionDetailsRespVO> page, @Param("vo") BankTransactionDetailsPageReqVO vo);
+
+    /**
+     * 导出查询银行流水交易明细（不分页，用于 Excel 导出）
+     *
+     * @param vo 查询条件
+     * @return 数据列表
+     */
+    List<BankTransactionDetailsRespVO> selectBankTransactionDetailsExportList(
+            @Param("vo") BankTransactionDetailsPageReqVO vo);
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/report/BankTransactionDetailsService.java

@@ -0,0 +1,34 @@
+package com.yc.ship.module.trade.service.report;
+
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsPageReqVO;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 银行流水交易明细 Service
+ *
+ * @author auto-generated
+ */
+public interface BankTransactionDetailsService {
+
+    /**
+     * 查询银行流水交易明细分页
+     *
+     * @param pageReqVO 分页查询条件
+     * @return 分页结果
+     */
+    PageResult<BankTransactionDetailsRespVO> getBankTransactionDetailsPage(BankTransactionDetailsPageReqVO pageReqVO);
+
+    /**
+     * 导出银行流水交易明细 Excel
+     *
+     * @param pageReqVO 查询条件
+     * @param response  HTTP响应
+     * @throws IOException IO异常
+     */
+    void exportBankTransactionDetailsExcel(BankTransactionDetailsPageReqVO pageReqVO, HttpServletResponse response) throws IOException;
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/report/impl/BankTransactionDetailsServiceImpl.java

@@ -0,0 +1,160 @@
+package com.yc.ship.module.trade.service.report.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.framework.excel.core.util.ExcelUtils;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsPageReqVO;
+import com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO;
+import com.yc.ship.module.trade.dal.mysql.report.BankTransactionDetailsMapper;
+import com.yc.ship.module.trade.enums.PayTypeEnum;
+import com.yc.ship.module.trade.service.report.BankTransactionDetailsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 银行流水交易明细 Service 实现类
+ * <p>
+ * 数据来源：
+ * 1. 订单支付（trade_order_pay, orderType=0, payStatus=1）
+ * 2. 订单退款（trade_order_pay, refundAmount > 0）
+ * 3. 充值（trade_order_pay, orderType=1）
+ * 4. 账单还款（ota_bill, billStatus=1）
+ * <p>
+ * 性能优化：
+ * - 使用 UNION ALL 在数据库层合并四类交易数据，单次 SQL 完成查询
+ * - 外层包装统一过滤条件，避免多次查询内存合并
+ * - 分页查询由 MyBatis-Plus IPage 自动处理
+ *
+ * @author auto-generated
+ */
+@Service
+@Slf4j
+public class BankTransactionDetailsServiceImpl implements BankTransactionDetailsService {
+
+    /** 交易类型常量 */
+    private static final int TRANSACTION_TYPE_PAYMENT = 1;
+    private static final int TRANSACTION_TYPE_REFUND = 2;
+    private static final int TRANSACTION_TYPE_RECHARGE = 3;
+    private static final int TRANSACTION_TYPE_BILL_REPAYMENT = 4;
+
+    @Resource
+    private BankTransactionDetailsMapper bankTransactionDetailsMapper;
+
+    /**
+     * 查询银行流水交易明细分页
+     */
+    @Override
+    public PageResult<BankTransactionDetailsRespVO> getBankTransactionDetailsPage(BankTransactionDetailsPageReqVO pageReqVO) {
+        IPage<BankTransactionDetailsRespVO> page = bankTransactionDetailsMapper.selectBankTransactionDetailsPage(
+                new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
+        // 转换枚举值为中文名称
+        convertEnumToName(page.getRecords());
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    /**
+     * 导出银行流水交易明细 Excel
+     * 数字字段导出为数字格式（通过 @NumberFormat 注解实现）
+     */
+    @Override
+    public void exportBankTransactionDetailsExcel(BankTransactionDetailsPageReqVO pageReqVO,
+                                                   HttpServletResponse response) throws IOException {
+        // 1. 查询所有数据（不分页）
+        List<BankTransactionDetailsRespVO> list = bankTransactionDetailsMapper.selectBankTransactionDetailsExportList(pageReqVO);
+        if (CollUtil.isEmpty(list)) {
+            log.warn("[exportBankTransactionDetailsExcel] 无数据可导出");
+        } else {
+            // 2. 转换枚举值为中文名称
+            convertEnumToName(list);
+            // 3. 计算合计行并追加到列表末尾
+            BankTransactionDetailsRespVO summary = calculateSummary(list);
+            list.add(summary);
+        }
+        // 4. 导出 Excel（amount 字段使用 @NumberFormat("0.00") 注解确保导出为数字格式）
+        ExcelUtils.write(response, "银行流水交易明细表.xls", "银行流水交易明细", BankTransactionDetailsRespVO.class, list);
+    }
+
+    /**
+     * 将枚举值转换为中文名称，便于前端展示和 Excel 导出
+     */
+    private void convertEnumToName(List<BankTransactionDetailsRespVO> list) {
+        if (CollUtil.isEmpty(list)) {
+            return;
+        }
+        for (BankTransactionDetailsRespVO item : list) {
+            // 转换交易类型
+            if (item.getTransactionType() != null) {
+                switch (item.getTransactionType()) {
+                    case "1":
+                        item.setTransactionType("支付");
+                        break;
+                    case "2":
+                        item.setTransactionType("退款");
+                        break;
+                    case "3":
+                        item.setTransactionType("充值");
+                        break;
+                    case "4":
+                        item.setTransactionType("账单还款");
+                        break;
+                    default:
+                        break;
+                }
+            }
+            // 转换支付方式
+            if (item.getPaymentMethod() != null) {
+                try {
+                    int payType = Integer.parseInt(item.getPaymentMethod());
+                    String payTypeName = getPayTypeName(payType);
+                    item.setPaymentMethod(payTypeName);
+                } catch (NumberFormatException e) {
+                    // 已经是中文名称，无需转换
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取支付方式名称
+     */
+    private String getPayTypeName(int payType) {
+        for (PayTypeEnum e : PayTypeEnum.values()) {
+            if (e.getType() == payType) {
+                return e.getName();
+            }
+        }
+        return "其他";
+    }
+
+    /**
+     * 计算合计行数据
+     */
+    private BankTransactionDetailsRespVO calculateSummary(List<BankTransactionDetailsRespVO> list) {
+        BankTransactionDetailsRespVO summary = new BankTransactionDetailsRespVO();
+        summary.setTransactionTime("合计");
+        summary.setBoardingTime("");
+        summary.setOrderNo("");
+        summary.setTravelAgencyName("");
+        summary.setPaymentMethod("");
+        summary.setTransactionType("");
+        summary.setBankSerialNo("");
+
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        for (BankTransactionDetailsRespVO item : list) {
+            if (item.getAmount() != null) {
+                totalAmount = totalAmount.add(item.getAmount());
+            }
+        }
+        summary.setAmount(totalAmount);
+        return summary;
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/BankTransactionDetailsMapper.xml

@@ -0,0 +1,207 @@
+<?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.yc.ship.module.trade.dal.mysql.report.BankTransactionDetailsMapper">
+
+    <!-- 公共查询条件片段 -->
+    <sql id="queryConditions">
+        <if test="vo.transactionTimeStart != null">
+            AND t.transactionTime &gt;= #{vo.transactionTimeStart}
+        </if>
+        <if test="vo.transactionTimeEnd != null">
+            AND t.transactionTime &lt;= #{vo.transactionTimeEnd}
+        </if>
+        <if test="vo.boardDate != null">
+            AND t.boardingTime = #{vo.boardDate}
+        </if>
+        <if test="vo.orderNo != null and vo.orderNo != ''">
+            AND t.orderNo LIKE CONCAT('%', #{vo.orderNo}, '%')
+        </if>
+        <if test="vo.customerName != null and vo.customerName != ''">
+            AND t.travelAgencyName LIKE CONCAT('%', #{vo.customerName}, '%')
+        </if>
+        <if test="vo.paymentMethod != null">
+            AND t.paymentMethod = #{vo.paymentMethod}
+        </if>
+        <if test="vo.transactionType != null">
+            AND t.transactionType = #{vo.transactionType}
+        </if>
+    </sql>
+
+    <!-- 分页查询银行流水交易明细 -->
+    <select id="selectBankTransactionDetailsPage"
+            resultType="com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO">
+        SELECT * FROM (
+            <!-- 1. 订单支付记录 -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+                o.order_no AS orderNo,
+                o.source_name AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                1 AS transactionType,
+                pay.pay_amount AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.sell_method != 101
+        and o.order_status in (3,6,7,8,9,10,12,13,15)
+        AND pay.refund_amount = 0
+        UNION ALL
+
+            <!-- 2. 订单退款记录 -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+                o.order_no AS orderNo,
+                o.source_name AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                2 AS transactionType,
+                -IFNULL(pay.refund_amount, 0) AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.refund_amount IS NOT NULL
+              AND pay.refund_amount &gt; 0
+
+            UNION ALL
+
+            <!-- 3. 充值记录(分销商在线充值) -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+                pay.bill_no AS orderNo,
+                IFNULL(dsrs.name, '') AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                3 AS transactionType,
+                pay.pay_amount AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+             INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            LEFT JOIN ota_distributor_self_recharge dsr ON pay.order_id = dsr.id AND dsr.deleted = 0 AND dsr.recharge_state = 1
+            LEFT JOIN ota_distributor dsrs ON dsr.distributor_id = dsrs.id AND dsrs.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.sell_method = 101
+
+            UNION ALL
+
+            <!-- 4. 账单还款记录 -->
+        SELECT
+        DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+        '' AS boardingTime,
+        pay.bill_no AS orderNo,
+        o.source_name  AS travelAgencyName,
+        pay.payment_type AS paymentMethod,
+        4 AS transactionType,
+        pay.pay_amount AS amount,
+        IFNULL(pay.payment_no, '') AS bankSerialNo
+        FROM trade_order_pay pay
+        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        INNER JOIN ota_bill_order obo ON obo.order_id = o.id
+        INNER JOIN ota_bill bill ON bill.id = obo.bill_id AND bill.deleted = 0
+        WHERE pay.deleted = 0
+        AND pay.pay_status = 1
+        AND bill.bill_status in (1,2)
+        ) t
+        WHERE 1 = 1
+        <include refid="queryConditions"/>
+        ORDER BY t.transactionTime DESC
+    </select>
+
+    <!-- 导出查询（与分页查询一致，不分页） -->
+    <select id="selectBankTransactionDetailsExportList"
+            resultType="com.yc.ship.module.trade.controller.admin.report.vo.BankTransactionDetailsRespVO">
+        SELECT * FROM (
+            <!-- 1. 订单支付记录 -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+                o.order_no AS orderNo,
+                o.source_name AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                1 AS transactionType,
+                pay.pay_amount AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.sell_method != 101
+        and o.order_status in (3,6,7,8,9,10,12,13,15)
+        AND pay.refund_amount = 0
+
+        UNION ALL
+
+            <!-- 2. 订单退款记录 -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+                o.order_no AS orderNo,
+                o.source_name AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                2 AS transactionType,
+                -IFNULL(pay.refund_amount, 0) AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+            INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+            LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.refund_amount IS NOT NULL
+              AND pay.refund_amount &gt; 0
+
+            UNION ALL
+
+            <!-- 3. 充值记录(分销商在线充值) -->
+            SELECT
+                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+        DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
+        pay.bill_no AS orderNo,
+                IFNULL(dsrs.name, '') AS travelAgencyName,
+                pay.payment_type AS paymentMethod,
+                3 AS transactionType,
+                pay.pay_amount AS amount,
+                IFNULL(pay.payment_no, '') AS bankSerialNo
+            FROM trade_order_pay pay
+        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
+            LEFT JOIN ota_distributor_self_recharge dsr ON pay.order_id = dsr.id AND dsr.deleted = 0 AND dsr.recharge_state = 1
+            LEFT JOIN ota_distributor dsrs ON dsr.distributor_id = dsrs.id AND dsrs.deleted = 0
+            WHERE pay.deleted = 0
+              AND pay.pay_status = 1
+              AND pay.sell_method = 101
+
+            UNION ALL
+
+            <!-- 4. 账单还款记录 -->
+        SELECT
+        DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+        '' AS boardingTime,
+        pay.bill_no AS orderNo,
+        o.source_name  AS travelAgencyName,
+        pay.payment_type AS paymentMethod,
+        4 AS transactionType,
+        pay.pay_amount AS amount,
+        IFNULL(pay.payment_no, '') AS bankSerialNo
+        FROM trade_order_pay pay
+        INNER JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
+        INNER JOIN ota_bill_order obo ON obo.order_id = o.id
+        INNER JOIN ota_bill bill ON bill.id = obo.bill_id AND bill.deleted = 0
+        WHERE pay.deleted = 0
+        AND pay.pay_status = 1
+        AND bill.bill_status in (1,2)
+        ) t
+        WHERE 1 = 1
+        <include refid="queryConditions"/>
+        ORDER BY t.transactionTime DESC
+    </select>
+
+</mapper>