From ad470e2dd69d59d649f5f997cf04b9d7d216ed69 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Mon, 2 Dec 2024 15:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Epayment=5Fid=20,=20payment=5F?=
 =?UTF-8?q?confirm=5Fid=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/domain/OrderSplitRecord.java    | 12 +++++++++++-
 .../resources/mapper/pile/OrderSplitRecordMapper.xml | 10 ++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java
index 331eda6d4..3f65df5f5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java
@@ -45,6 +45,16 @@ public class OrderSplitRecord {
     */
     private String status;
 
+    /**
+     * 支付对象id
+     */
+    private String paymentId;
+
+    /**
+     * 支付确认对象id
+     */
+    private String paymentConfirmId;
+
     /**
     * 电费分成比例
     */
@@ -73,7 +83,7 @@ public class OrderSplitRecord {
     /**
     * 创建人
     */
-    private String cerateBy;
+    private String createBy;
 
     /**
     * 创建时间
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
index 80cca0a4b..40adcb2bf 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
@@ -6,15 +6,17 @@
     <!--@Table order_split_record-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
+    <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" />
     <result column="adapay_member_id" jdbcType="VARCHAR" property="adapayMemberId" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="payment_id" jdbcType="VARCHAR" property="paymentId" />
+    <result column="payment_confirm_id" jdbcType="VARCHAR" property="paymentConfirmId" />
     <result column="electricity_split_ratio" jdbcType="DECIMAL" property="electricitySplitRatio" />
     <result column="electricity_split_amount" jdbcType="DECIMAL" property="electricitySplitAmount" />
     <result column="service_split_ratio" jdbcType="DECIMAL" property="serviceSplitRatio" />
     <result column="service_split_amount" jdbcType="DECIMAL" property="serviceSplitAmount" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="cerate_by" jdbcType="VARCHAR" property="cerateBy" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -22,8 +24,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, order_code, settle_amount, adapay_member_id, `status`, electricity_split_ratio, 
-    electricity_split_amount, service_split_ratio, service_split_amount, remark, cerate_by, 
+    id, `status`, order_code, settle_amount, adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio,
+    electricity_split_amount, service_split_ratio, service_split_amount, remark, create_by,
     create_time, update_by, update_time, del_flag
   </sql>