From f267ac9f34a058164318bda4c543e0dde550aa1c Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 13 Jul 2023 16:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E5=8D=95=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/domain/OrderPayRecord.java   |  5 ++
 .../mapper/pile/OrderPayRecordMapper.xml      | 85 +++----------------
 2 files changed, 15 insertions(+), 75 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java
index 8b1b8aeee..c705af271 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java
@@ -43,6 +43,11 @@ public class OrderPayRecord {
 	 */
 	private BigDecimal refundAmount;
 
+	/**
+	 * 收单机构（0-本账户余额；1-微信支付；2-汇付支付）
+	 */
+	private String acquirer;
+
 	/**
 	 * 创建人
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml
index 340961104..5d4651d97 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml
@@ -9,6 +9,7 @@
     <result column="pay_mode" jdbcType="VARCHAR" property="payMode" />
     <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
     <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
+    <result column="acquirer" jdbcType="VARCHAR" property="acquirer" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
@@ -17,8 +18,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, order_code, pay_mode, pay_amount, refund_amount, create_by, create_time, update_by, update_time,
-    del_flag
+    id, order_code, pay_mode, pay_amount, refund_amount, acquirer,
+    create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -32,77 +33,7 @@
     delete from order_pay_record
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderPayRecord" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_pay_record (order_code, pay_mode, pay_amount, refund_amount,
-      create_by, create_time, update_by, 
-      update_time, del_flag)
-    values (#{orderCode,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, #{refundAmount,jdbcType=DECIMAL},
-      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR})
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderPayRecord" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_pay_record
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="orderCode != null and orderCode != ''">
-        order_code,
-      </if>
-      <if test="payMode != null and payMode != ''">
-        pay_mode,
-      </if>
-      <if test="payAmount != null">
-        pay_amount,
-      </if>
-      <if test="refundAmount != null">
-        refund_amount,
-      </if>
-      <if test="createBy != null and createBy != ''">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateBy != null and updateBy != ''">
-        update_by,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="delFlag != null and delFlag != ''">
-        del_flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="orderCode != null and orderCode != ''">
-        #{orderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="payMode != null and payMode != ''">
-        #{payMode,jdbcType=VARCHAR},
-      </if>
-      <if test="payAmount != null">
-        #{payAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="refundAmount != null">
-        #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="createBy != null and createBy != ''">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null and updateBy != ''">
-        #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null and delFlag != ''">
-        #{delFlag,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
+
   <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.OrderPayRecord">
     <!--@mbg.generated-->
     update order_pay_record
@@ -119,6 +50,9 @@
       <if test="refundAmount != null">
         refund_amount = #{refundAmount,jdbcType=DECIMAL},
       </if>
+      <if test="acquirer != null">
+        acquirer = #{acquirer,jdbcType=VARCHAR},
+      </if>
       <if test="createBy != null and createBy != ''">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -144,6 +78,7 @@
       pay_mode = #{payMode,jdbcType=VARCHAR},
       pay_amount = #{payAmount,jdbcType=DECIMAL},
       refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      acquirer = #{acquirer,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_by = #{updateBy,jdbcType=VARCHAR},
@@ -154,12 +89,12 @@
 
   <insert id="batchInsert">
     insert into order_pay_record
-    (order_code, pay_mode, pay_amount, create_by)
+    (order_code, pay_mode, pay_amount, acquirer, create_by)
     values
     <foreach collection="payRecordList" item="item" separator=",">
       (
           #{item.orderCode,jdbcType=VARCHAR}, #{item.payMode,jdbcType=VARCHAR}, #{item.payAmount,jdbcType=DECIMAL},
-          #{item.createBy,jdbcType=VARCHAR}
+          #{item.acquirer,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}
       )
     </foreach>
   </insert>