From c42d0c1f81e3054d8faf88d8275aa6398ed1537b Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 18 Aug 2023 15:11:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A0=E8=BF=90=E8=90=A5=E5=95=86id?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/pile/domain/OrderInvoiceRecord.java   | 6 ++++++
 .../resources/mapper/pile/OrderInvoiceRecordMapper.xml     | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java
index 4441b4639..e626511e2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderInvoiceRecord.java
@@ -29,6 +29,12 @@ public class OrderInvoiceRecord extends BaseEntity {
 	@Excel(name = "会员id")
 	private String memberId;
 
+	/**
+	 * 运营商id
+	 */
+	@Excel(name = "运营商id")
+	private String merchantId;
+
 	/**
 	 * 发票抬头id
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
index 9f27066d2..634324556 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="com.jsowell.pile.domain.OrderInvoiceRecord" id="OrderInvoiceRecordResult">
         <result property="id"    column="id"    />
         <result property="memberId"    column="member_id"    />
+        <result property="merchantId"    column="merchant_id"    />
         <result property="titleId"    column="title_id"    />
         <result property="phoneNumber"    column="phone_number"    />
         <result property="email"    column="email"    />
@@ -24,7 +25,7 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
-        id, member_id, title_id, phone_number, email, order_codes, status, total_amount, total_service_amount, total_elec_amount,
+        id, member_id, merchant_id, title_id, phone_number, email, order_codes, status, total_amount, total_service_amount, total_elec_amount,
         create_by, create_time, update_by, update_time, del_flag
     </sql>
 
@@ -38,6 +39,7 @@
         <include refid="selectOrderInvoiceRecordVo"/>
         <where>
             <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
+            <if test="merchantId != null  and merchantId != ''"> and merchant_id = #{merchantId}</if>
             <if test="orderCodes != null  and orderCodes != ''"> and order_codes like concat('%', #{orderCodes}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
@@ -56,6 +58,7 @@
         insert into order_invoice_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="memberId != null">member_id,</if>
+            <if test="merchantId != null">merchant_id,</if>
             <if test="titleId != null">title_id,</if>
             <if test="phoneNumber != null">phone_number,</if>
             <if test="email != null">email,</if>
@@ -72,6 +75,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberId != null">#{memberId},</if>
+            <if test="merchantId != null">#{merchantId},</if>
             <if test="titleId != null">#{titleId},</if>
             <if test="phoneNumber != null">#{phoneNumber},</if>
             <if test="email != null">#{email},</if>
@@ -92,6 +96,7 @@
         update order_invoice_record
         <trim prefix="SET" suffixOverrides=",">
             <if test="memberId != null">member_id = #{memberId},</if>
+            <if test="merchantId != null">merchant_id = #{merchantId},</if>
             <if test="orderCodes != null">order_codes = #{orderCodes},</if>
             <if test="status != null">status = #{status},</if>
             <if test="totalAmount != null">total_amount = #{totalAmount},</if>