From 2e959ab84588de4b153a5945652bbb0dd0525b7d Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Mon, 12 May 2025 09:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AE=A1=E9=A1=B5=E9=9D=A2=E5=88=86?=
 =?UTF-8?q?=E6=B6=A6=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=20=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/service/impl/OrderSplitRecordServiceImpl.java       | 1 +
 .../java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java     | 5 +++++
 .../main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java | 5 +++++
 .../main/resources/mapper/pile/OrderSplitRecordMapper.xml    | 1 +
 4 files changed, 12 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
index 015c9f20d..10ebd25ec 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
@@ -307,6 +307,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
 
             SplitRecordInfoVO vo = SplitRecordInfoVO.builder()
                     .orderCode(orderCode)
+                    .settlementTime(splitRecordVOList.get(0).getSettlementTime())
                     .orderAmount(splitRecordVOList.get(0).getOrderAmount())
                     .settleAmount(String.valueOf(splitRecordVOList.get(0).getSettleAmount()))
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java
index 1b88eb6c3..2ad0286db 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java
@@ -16,6 +16,11 @@ public class OrderSplitRecordVO {
      */
     private String stationId;
 
+    /**
+     * 结算时间
+     */
+    private String settlementTime;
+
     /**
      * 订单金额
      */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
index 7dc81c16a..0a98301a3 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java
@@ -26,6 +26,11 @@ public class SplitRecordInfoVO {
      */
     private String orderAmount;
 
+    /**
+     * 结算时间
+     */
+    private String settlementTime;
+
     /**
      * 结算金额
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
index fe19f6d4f..e218b506a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
@@ -803,6 +803,7 @@
   <select id="queryOrderSplitData" resultType="com.jsowell.pile.vo.web.OrderSplitRecordVO">
     SELECT
       t1.order_code AS orderCode,
+    t2.settlement_time as settlementTime,
       t1.station_id AS stationId,
       t2.order_amount AS orderAmount,
       t1.settle_amount AS settleAmount,