From 21772ca7966140d25bb585b7d7ad75c092c47f23 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 16 Apr 2025 11:57:59 +0800
Subject: [PATCH] update

---
 .../pile/domain/OrderUnsplitRecord.java       | 37 ++++++++-------
 .../pile/mapper/OrderUnsplitRecordMapper.java |  2 +
 .../mapper/pile/OrderUnsplitRecordMapper.xml  | 45 ++++++++++++++++---
 3 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderUnsplitRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderUnsplitRecord.java
index 272314718..86559b649 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderUnsplitRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderUnsplitRecord.java
@@ -17,42 +17,47 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 public class OrderUnsplitRecord {
     /**
-    * 主键
-    */
+     * 主键
+     */
     private Integer id;
 
     /**
-    * 支付id
-    */
+     * 支付id
+     */
     private String paymentId;
 
     /**
-    * 状态
-    */
+     * 状态
+     */
     private String status;
 
     /**
-    * 订单编号
-    */
+     * 订单编号
+     */
     private String orderCode;
 
     /**
-    * 支付金额
-    */
+     * 支付金额
+     */
     private BigDecimal payAmount;
 
     /**
-    * 结算金额
-    */
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 结算金额
+     */
     private BigDecimal settleAmount;
 
     /**
-    * 订单时间
-    */
+     * 订单时间
+     */
     private Date orderTime;
 
     /**
-    * 记录添加时间
-    */
+     * 记录添加时间
+     */
     private Date createTime;
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderUnsplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderUnsplitRecordMapper.java
index 81095aa32..a31c21653 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderUnsplitRecordMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderUnsplitRecordMapper.java
@@ -1,7 +1,9 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderUnsplitRecord;
+
 import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface OrderUnsplitRecordMapper {
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderUnsplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderUnsplitRecordMapper.xml
index a05899c6f..5a10c4a60 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderUnsplitRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderUnsplitRecordMapper.xml
@@ -9,13 +9,15 @@
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
     <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
     <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" />
     <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, payment_id, `status`, order_code, pay_amount, settle_amount, order_time, create_time
+    id, payment_id, `status`, order_code, pay_amount, refund_amount, settle_amount, order_time, 
+    create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -45,6 +47,9 @@
       <if test="payAmount != null">
         pay_amount,
       </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
       <if test="settleAmount != null">
         settle_amount,
       </if>
@@ -68,6 +73,9 @@
       <if test="payAmount != null">
         #{payAmount,jdbcType=DECIMAL},
       </if>
+      <if test="refundAmount != null">
+        #{refundAmount,jdbcType=DECIMAL},
+      </if>
       <if test="settleAmount != null">
         #{settleAmount,jdbcType=DECIMAL},
       </if>
@@ -95,6 +103,9 @@
       <if test="payAmount != null">
         pay_amount = #{payAmount,jdbcType=DECIMAL},
       </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      </if>
       <if test="settleAmount != null">
         settle_amount = #{settleAmount,jdbcType=DECIMAL},
       </if>
@@ -131,6 +142,11 @@
           when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
         </foreach>
       </trim>
+      <trim prefix="refund_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
+        </foreach>
+      </trim>
       <trim prefix="settle_amount = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
@@ -184,6 +200,13 @@
           </if>
         </foreach>
       </trim>
+      <trim prefix="refund_amount = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.refundAmount != null">
+            when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
+          </if>
+        </foreach>
+      </trim>
       <trim prefix="settle_amount = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           <if test="item.settleAmount != null">
@@ -214,13 +237,13 @@
   <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into order_unsplit_record
-    (payment_id, `status`, order_code, pay_amount, settle_amount, order_time, create_time
-      )
+    (payment_id, `status`, order_code, pay_amount, refund_amount, settle_amount, order_time, 
+      create_time)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.paymentId,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, #{item.orderCode,jdbcType=VARCHAR}, 
-        #{item.payAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, #{item.orderTime,jdbcType=TIMESTAMP}, 
-        #{item.createTime,jdbcType=TIMESTAMP})
+        #{item.payAmount,jdbcType=DECIMAL}, #{item.refundAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, 
+        #{item.orderTime,jdbcType=TIMESTAMP}, #{item.createTime,jdbcType=TIMESTAMP})
     </foreach>
   </insert>
   <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderUnsplitRecord" useGeneratedKeys="true">
@@ -234,6 +257,7 @@
       `status`,
       order_code,
       pay_amount,
+      refund_amount,
       settle_amount,
       order_time,
       create_time,
@@ -247,6 +271,7 @@
       #{status,jdbcType=VARCHAR},
       #{orderCode,jdbcType=VARCHAR},
       #{payAmount,jdbcType=DECIMAL},
+      #{refundAmount,jdbcType=DECIMAL},
       #{settleAmount,jdbcType=DECIMAL},
       #{orderTime,jdbcType=TIMESTAMP},
       #{createTime,jdbcType=TIMESTAMP},
@@ -260,6 +285,7 @@
       `status` = #{status,jdbcType=VARCHAR},
       order_code = #{orderCode,jdbcType=VARCHAR},
       pay_amount = #{payAmount,jdbcType=DECIMAL},
+      refund_amount = #{refundAmount,jdbcType=DECIMAL},
       settle_amount = #{settleAmount,jdbcType=DECIMAL},
       order_time = #{orderTime,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -284,6 +310,9 @@
       <if test="payAmount != null">
         pay_amount,
       </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
       <if test="settleAmount != null">
         settle_amount,
       </if>
@@ -311,6 +340,9 @@
       <if test="payAmount != null">
         #{payAmount,jdbcType=DECIMAL},
       </if>
+      <if test="refundAmount != null">
+        #{refundAmount,jdbcType=DECIMAL},
+      </if>
       <if test="settleAmount != null">
         #{settleAmount,jdbcType=DECIMAL},
       </if>
@@ -338,6 +370,9 @@
       <if test="payAmount != null">
         pay_amount = #{payAmount,jdbcType=DECIMAL},
       </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      </if>
       <if test="settleAmount != null">
         settle_amount = #{settleAmount,jdbcType=DECIMAL},
       </if>