From 1b91b6d1b8489234c970d2fbefc3c8859fc2d2ba Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 8 Jun 2023 14:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B1=87=E4=BB=98=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/domain/AdapayMemberInfo.java |  2 ++
 .../mapper/pile/AdapayMemberInfoMapper.xml    | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java
index 454aba793..fadf30590 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayMemberInfo.java
@@ -18,6 +18,8 @@ public class AdapayMemberInfo {
     */
     private Integer id;
 
+    private String merchantId;
+
     /**
     * 汇付会员id
     */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml
index 7bdb6aadd..a0789d057 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberInfoMapper.xml
@@ -5,6 +5,7 @@
     <!--@mbg.generated-->
     <!--@Table adapay_member_info-->
     <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
     <result column="member_id" jdbcType="VARCHAR" property="memberId" />
     <result column="gender" jdbcType="VARCHAR" property="gender" />
     <result column="identified" jdbcType="VARCHAR" property="identified" />
@@ -22,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, member_id, gender, `identified`, tel_no, prod_mode, nickname, disabled, `location`, 
+    id, merchant_id, member_id, gender, `identified`, tel_no, prod_mode, nickname, disabled, `location`,
     app_id, email, `object`, `status`, create_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -39,12 +40,12 @@
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayMemberInfo" useGeneratedKeys="true">
     <!--@mbg.generated-->
-    insert into adapay_member_info (member_id, gender, `identified`, 
+    insert into adapay_member_info (merchant_id, member_id, gender, `identified`,
       tel_no, prod_mode, nickname, 
       disabled, `location`, app_id, 
       email, `object`, `status`, 
       create_time, del_flag)
-    values (#{memberId,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, #{identified,jdbcType=VARCHAR}, 
+    values (#{merchantId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, #{identified,jdbcType=VARCHAR},
       #{telNo,jdbcType=INTEGER}, #{prodMode,jdbcType=VARCHAR}, #{nickname,jdbcType=VARCHAR}, 
       #{disabled,jdbcType=VARCHAR}, #{location,jdbcType=VARCHAR}, #{appId,jdbcType=INTEGER}, 
       #{email,jdbcType=VARCHAR}, #{object,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
@@ -54,6 +55,9 @@
     <!--@mbg.generated-->
     insert into adapay_member_info
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="merchantId != null">
+        merchant_id,
+      </if>
       <if test="memberId != null">
         member_id,
       </if>
@@ -98,6 +102,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="merchantId != null">
+        #{merchantId,jdbcType=VARCHAR},
+      </if>
       <if test="memberId != null">
         #{memberId,jdbcType=VARCHAR},
       </if>
@@ -146,6 +153,9 @@
     <!--@mbg.generated-->
     update adapay_member_info
     <set>
+      <if test="merchantId != null">
+        merchant_id = #{merchantId,jdbcType=VARCHAR},
+      </if>
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
       </if>
@@ -194,7 +204,8 @@
   <update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.AdapayMemberInfo">
     <!--@mbg.generated-->
     update adapay_member_info
-    set member_id = #{memberId,jdbcType=VARCHAR},
+    set merchant_id = #{merchantId,jdbcType=VARCHAR},
+        member_id = #{memberId,jdbcType=VARCHAR},
       gender = #{gender,jdbcType=VARCHAR},
       `identified` = #{identified,jdbcType=VARCHAR},
       tel_no = #{telNo,jdbcType=INTEGER},