品牌联合商户表添加来源商户ID

gic-store-service/src/main/java/com/gic/store/entity/TabStoreBrand.java

@@ -70,6 +70,8 @@ public class TabStoreBrand {
 
     private Integer type;
 
+    private Integer fromEnterpriseId;
+
     public Integer getStoreBrandId() {
         return storeBrandId;
     }
@@ -165,4 +167,13 @@ public class TabStoreBrand {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    public Integer getFromEnterpriseId() {
+        return fromEnterpriseId;
+    }
+
+    public TabStoreBrand setFromEnterpriseId(Integer fromEnterpriseId) {
+        this.fromEnterpriseId = fromEnterpriseId;
+        return this;
+    }
 }
\ No newline at end of file

gic-store-service/src/main/resources/mapper/TabStoreBrandMapper.xml

@@ -14,13 +14,14 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="has_rel" jdbcType="INTEGER" property="hasRel" />
     <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
   </resultMap>
   <sql id="Base_Column_List">
     store_brand_id, store_brand_code, store_brand_name, store_brand_category_code, store_brand_category, has_rel
   </sql>
   <sql id="Ref_Column_List">
     t1.store_brand_id, t1.store_brand_code, t1.store_brand_name, t1.store_brand_category_code, t1.store_brand_category, t1.has_rel,
-    t2.enterprise_id, t2.type, t2.sort, t2.delete_flag, t2.create_time, t2.update_time
+    t2.enterprise_id, t2.type, t2.sort, t2.delete_flag, t2.create_time, t2.update_time, t2.from_enterprise_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 

gic-store-service/src/main/resources/mapper/TabStoreBrandRefMapper.xml

@@ -5,6 +5,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="store_brand_id" jdbcType="INTEGER" property="storeBrandId" />
+    <result column="from_enterprise_id" jdbcType="INTEGER" property="fromEnterpriseId" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -12,7 +13,7 @@
     <result column="sort" jdbcType="DOUBLE" property="sort" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, enterprise_id, store_brand_id, type, create_time, update_time, delete_flag, sort
+    id, enterprise_id, store_brand_id, type, create_time, update_time, delete_flag, sort, from_enterprise_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,10 +28,10 @@
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreBrandRef">
     insert into tab_store_brand_ref (id, enterprise_id, store_brand_id, 
       type, create_time, update_time, 
-      delete_flag, sort)
+      delete_flag, sort, from_enterprise_id)
     values (#{id,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeBrandId,jdbcType=INTEGER}, 
       #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{deleteFlag,jdbcType=INTEGER}, #{sort,jdbcType=DOUBLE})
+      #{deleteFlag,jdbcType=INTEGER}, #{sort,jdbcType=DOUBLE}, #{fromEnterpriseId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreBrandRef">
     insert into tab_store_brand_ref
@@ -41,6 +42,9 @@
       <if test="enterpriseId != null">
         enterprise_id,
       </if>
+      <if test="fromEnterpriseId != null">
+        from_enterprise_id,
+      </if>
       <if test="storeBrandId != null">
         store_brand_id,
       </if>
@@ -67,6 +71,9 @@
       <if test="enterpriseId != null">
         #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="fromEnterpriseId != null">
+        #{fromEnterpriseId,jdbcType=INTEGER},
+      </if>
       <if test="storeBrandId != null">
         #{storeBrandId,jdbcType=INTEGER},
       </if>
@@ -93,6 +100,9 @@
       <if test="enterpriseId != null">
         enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       </if>
+      <if test="fromEnterpriseId != null">
+        from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
+      </if>
       <if test="storeBrandId != null">
         store_brand_id = #{storeBrandId,jdbcType=INTEGER},
       </if>
@@ -117,6 +127,7 @@
   <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreBrandRef">
     update tab_store_brand_ref
     set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER},
       store_brand_id = #{storeBrandId,jdbcType=INTEGER},
       type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -162,12 +173,12 @@
   <insert id="insertList" parameterType="com.gic.store.entity.TabStoreBrandRef">
     insert into tab_store_brand_ref (enterprise_id, store_brand_id,
       type, create_time, update_time,
-      delete_flag, sort)
+      delete_flag, sort, from_enterprise_id)
     values
     <foreach collection="list" item="element" index="index" separator=",">
     (#{element.enterpriseId,jdbcType=INTEGER}, #{element.storeBrandId,jdbcType=INTEGER},
       #{element.type,jdbcType=INTEGER}, #{element.createTime,jdbcType=TIMESTAMP}, #{element.updateTime,jdbcType=TIMESTAMP},
-      #{element.deleteFlag,jdbcType=INTEGER}, #{element.sort,jdbcType=DOUBLE})
+      #{element.deleteFlag,jdbcType=INTEGER}, #{element.sort,jdbcType=DOUBLE}, #{element.fromEnterpriseId,jdbcType=INTEGER})
     </foreach>
   </insert>