门店品牌变更

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

@@ -54,6 +54,8 @@ public class StoreBrandDTO implements Serializable {
     private Integer seq;
 
     private Integer hasRel;
+    /**1自有  2共享*/
+    private Integer type;
 
     public Integer getStoreBrandId() {
         return storeBrandId;
@@ -143,6 +145,14 @@ public class StoreBrandDTO implements Serializable {
         this.hasRel = hasRel;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     @Override
     public String toString() {
         return "StoreBrandDTO{" +
@@ -157,6 +167,7 @@ public class StoreBrandDTO implements Serializable {
                 ", updateTime=" + updateTime +
                 ", seq=" + seq +
                 ", hasRel=" + hasRel +
+                ", type=" + type +
                 '}';
     }
 }

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBrandMapper.java

@@ -62,19 +62,6 @@ public interface TabStoreBrandMapper {
     int updateByPrimaryKey(TabStoreBrand record);
 
     /**
-     * 查询最小的排序号
-     * @param enterpriseId
-     * @return
-     */
-    Double getMinSort(@Param("enterpriseId") Integer enterpriseId);
-
-    /**
-     * 查询最大的排序号
-     * @param enterpriseId
-     * @return
-     */
-    Double getMaxSort(@Param("enterpriseId") Integer enterpriseId);
-    /**
      * 查询符合条件的个数； 除id所有值取等于计算， id取不等于计算
      * @param enterpriseId
      * @param storeBrandCode
@@ -147,4 +134,6 @@ public interface TabStoreBrandMapper {
      * @throws
      */
     TabStoreBrand getByStoreBrandName(@Param("enterpriseId") Integer enterpriseId, @Param("storeBrandName") String storeBrandName);
+
+
 }
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/dao/mapper/TabStoreBrandRefMapper.java

+package com.gic.store.dao.mapper;
+
+import com.gic.store.entity.TabStoreBrandRef;
+import org.apache.ibatis.annotations.Param;
+
+public interface TabStoreBrandRefMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param id 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabStoreBrandRef record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabStoreBrandRef record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param id 主键
+     * @return 实体对象
+     */
+    TabStoreBrandRef selectByPrimaryKey(Integer id);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabStoreBrandRef record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabStoreBrandRef record);
+
+    /**
+     * 查询最小的排序号
+     * @param enterpriseId
+     * @return
+     */
+    Double getMinSort(@Param("enterpriseId") Integer enterpriseId);
+
+    /**
+     * 查询最大的排序号
+     * @param enterpriseId
+     * @return
+     */
+    Double getMaxSort(@Param("enterpriseId") Integer enterpriseId);
+
+    /**
+     * selectByEidAndBrandId
+     * @Title: selectByEidAndBrandId
+     * @Description:
+     * @author taogs
+     * @param enterpriseId
+     * @param storeBrandId
+     * @return com.gic.store.entity.TabStoreBrandRef
+     * @throws
+     */
+    TabStoreBrandRef selectByEidAndBrandId(@Param("enterpriseId") Integer enterpriseId, @Param("storeBrandId") Integer storeBrandId);
+
+    /**
+     * updateSort
+     * @Title: updateSort
+     * @Description:  更新排序
+     * @author taogs
+     * @param enterpriseId
+     * @param storeBrandId
+     * @param sort
+     * @return java.lang.Integer
+     * @throws
+     */
+    Integer updateSort(@Param("enterpriseId") Integer enterpriseId, @Param("storeBrandId") Integer storeBrandId, @Param("sort") Double sort);
+}
\ No newline at end of file

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

@@ -68,6 +68,8 @@ public class TabStoreBrand {
      */
     private Integer hasRel;
 
+    private Integer type;
+
     public Integer getStoreBrandId() {
         return storeBrandId;
     }
@@ -155,4 +157,12 @@ public class TabStoreBrand {
     public void setHasRel(Integer hasRel) {
         this.hasRel = hasRel;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }
\ No newline at end of file

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

+package com.gic.store.entity;
+
+import java.util.Date;
+
+/**
+ * tab_store_brand_ref
+ */
+public class TabStoreBrandRef {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 
+     */
+    private Integer storeBrandId;
+
+    /**
+     * 1自有  2共享
+     */
+    private Integer type;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 
+     */
+    private Double sort;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStoreBrandId() {
+        return storeBrandId;
+    }
+
+    public void setStoreBrandId(Integer storeBrandId) {
+        this.storeBrandId = storeBrandId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+}
\ No newline at end of file

gic-store-service/src/main/java/com/gic/store/service/StoreBrandService.java

@@ -23,6 +23,19 @@ public interface StoreBrandService {
     Integer save(StoreBrandDTO storeBrandDTO);
 
     /**
+     * saveStoreBrandRef
+     * @Title: saveStoreBrandRef
+     * @Description: 保存品牌关联表
+     * @author taogs
+     * @param enterpriseId
+     * @param storeBrandId
+     * @param type
+     * @return void
+     * @throws
+     */
+    void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer type);
+
+    /**
      * update
      * @Title: update
      * @Description:

gic-store-service/src/main/java/com/gic/store/service/impl/StoreBrandServiceImpl.java

@@ -2,8 +2,10 @@ package com.gic.store.service.impl;
 
 import com.gic.commons.util.GlobalInfo;
 import com.gic.store.dao.mapper.TabStoreBrandMapper;
+import com.gic.store.dao.mapper.TabStoreBrandRefMapper;
 import com.gic.store.dto.StoreBrandDTO;
 import com.gic.store.entity.TabStoreBrand;
+import com.gic.store.entity.TabStoreBrandRef;
 import com.gic.store.service.StoreBrandService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -26,6 +28,8 @@ public class StoreBrandServiceImpl implements StoreBrandService {
 
     @Autowired
     private TabStoreBrandMapper tabStoreBrandMapper;
+    @Autowired
+    private TabStoreBrandRefMapper tabStoreBrandRefMapper;
 
     @Override
     public Integer save(StoreBrandDTO copy) {
@@ -34,18 +38,36 @@ public class StoreBrandServiceImpl implements StoreBrandService {
         storeBrand.setStoreBrandName(copy.getStoreBrandName());
         storeBrand.setStoreBrandCategoryCode(copy.getStoreBrandCategoryCode());
         storeBrand.setStoreBrandCategory(copy.getStoreBrandCategory());
-        storeBrand.setEnterpriseId(copy.getEnterpriseId());
         storeBrand.setDeleteFlag(0);
         storeBrand.setCreateTime(new Date());
         storeBrand.setHasRel(GlobalInfo.DATA_STATUS_DELETE);
-
-        Double sort = tabStoreBrandMapper.getMinSort(copy.getEnterpriseId());
-        storeBrand.setSort(sort == null ? 1d : sort - 1d);
         tabStoreBrandMapper.insertSelective(storeBrand);
+        TabStoreBrandRef tabStoreBrandRef = new TabStoreBrandRef();
+        Double sort = tabStoreBrandRefMapper.getMinSort(copy.getEnterpriseId());
+        tabStoreBrandRef.setSort(sort == null ? 1d : sort - 1d);
+        tabStoreBrandRef.setEnterpriseId(copy.getEnterpriseId());
+        tabStoreBrandRef.setStoreBrandId(storeBrand.getStoreBrandId());
+        tabStoreBrandRef.setDeleteFlag(0);
+        tabStoreBrandRef.setCreateTime(new Date());
+        tabStoreBrandRef.setType(copy.getType());
+        tabStoreBrandRefMapper.insertSelective(tabStoreBrandRef);
         return storeBrand.getStoreBrandId();
     }
 
     @Override
+    public void saveStoreBrandRef(Integer enterpriseId, Integer storeBrandId, Integer type){
+        TabStoreBrandRef tabStoreBrandRef = new TabStoreBrandRef();
+        Double sort = tabStoreBrandRefMapper.getMinSort(enterpriseId);
+        tabStoreBrandRef.setSort(sort == null ? 1d : sort - 1d);
+        tabStoreBrandRef.setEnterpriseId(enterpriseId);
+        tabStoreBrandRef.setStoreBrandId(storeBrandId);
+        tabStoreBrandRef.setDeleteFlag(0);
+        tabStoreBrandRef.setCreateTime(new Date());
+        tabStoreBrandRef.setType(type);
+        tabStoreBrandRefMapper.insertSelective(tabStoreBrandRef);
+    }
+
+    @Override
     public Integer update(StoreBrandDTO copy) {
         TabStoreBrand storeBrand = new TabStoreBrand();
         storeBrand.setStoreBrandId(copy.getStoreBrandId());
@@ -85,45 +107,37 @@ public class StoreBrandServiceImpl implements StoreBrandService {
 
     @Override
     public void sortMoveUp(Integer enterpriseId, Integer storeBrandId) {
-        TabStoreBrand tabStoreBrand = tabStoreBrandMapper.selectByPrimaryKey(storeBrandId);
-        TabStoreBrand prevStoreBrand = tabStoreBrandMapper.getPrevSort(enterpriseId, tabStoreBrand.getSort());
-        swapSort(tabStoreBrand, prevStoreBrand);
+        TabStoreBrandRef tabStoreBrandRef = tabStoreBrandRefMapper.selectByEidAndBrandId(enterpriseId, storeBrandId);
+        TabStoreBrand prevStoreBrand = tabStoreBrandMapper.getPrevSort(enterpriseId, tabStoreBrandRef.getSort());
+        swapSort(tabStoreBrandRef, prevStoreBrand);
     }
 
     @Override
     public void sortMoveDown(Integer enterpriseId, Integer storeBrandId) {
-        TabStoreBrand tabStoreBrand = tabStoreBrandMapper.selectByPrimaryKey(storeBrandId);
-        TabStoreBrand nextStoreBrand = tabStoreBrandMapper.getNextSort(enterpriseId, tabStoreBrand.getSort());
-        swapSort(tabStoreBrand, nextStoreBrand);
+        TabStoreBrandRef tabStoreBrandRef = tabStoreBrandRefMapper.selectByEidAndBrandId(enterpriseId, storeBrandId);
+        TabStoreBrand nextStoreBrand = tabStoreBrandMapper.getNextSort(enterpriseId, tabStoreBrandRef.getSort());
+        swapSort(tabStoreBrandRef, nextStoreBrand);
     }
 
-    private void swapSort(TabStoreBrand tabStoreBrand, TabStoreBrand prevStoreBrand) {
+    private void swapSort(TabStoreBrandRef tabStoreBrandRef, TabStoreBrand prevStoreBrand) {
         if (prevStoreBrand != null) {
-            Double temp = tabStoreBrand.getSort();
-            tabStoreBrand.setSort(prevStoreBrand.getSort());
-            prevStoreBrand.setSort(temp);
-            tabStoreBrandMapper.updateByPrimaryKeySelective(tabStoreBrand);
-            tabStoreBrandMapper.updateByPrimaryKeySelective(prevStoreBrand);
+            Double temp = tabStoreBrandRef.getSort();
+            tabStoreBrandRefMapper.updateSort(tabStoreBrandRef.getEnterpriseId(), tabStoreBrandRef.getStoreBrandId(), prevStoreBrand.getSort());
+            tabStoreBrandRefMapper.updateSort(prevStoreBrand.getEnterpriseId(), prevStoreBrand.getStoreBrandId(), temp);
         }
     }
 
     @Override
     public void sortTopping(Integer enterpriseId, Integer storeBrandId) {
-        Double sort = tabStoreBrandMapper.getMinSort(enterpriseId);
-        TabStoreBrand tabStoreBrand = new TabStoreBrand();
-        tabStoreBrand.setStoreBrandId(storeBrandId);
-        tabStoreBrand.setSort(sort - 1d);
-        tabStoreBrandMapper.updateByPrimaryKeySelective(tabStoreBrand);
+        Double sort = tabStoreBrandRefMapper.getMinSort(enterpriseId);
+        tabStoreBrandRefMapper.updateSort(enterpriseId, storeBrandId, sort - 1d);
     }
 
     @Override
     public void sortBottom(Integer enterpriseId, Integer storeBrandId) {
-        Double sort = tabStoreBrandMapper.getMaxSort(enterpriseId);
+        Double sort = tabStoreBrandRefMapper.getMaxSort(enterpriseId);
         if (sort != null) {
-            TabStoreBrand tabStoreBrand = new TabStoreBrand();
-            tabStoreBrand.setStoreBrandId(storeBrandId);
-            tabStoreBrand.setSort(sort + 1d);
-            tabStoreBrandMapper.updateByPrimaryKeySelective(tabStoreBrand);
+            tabStoreBrandRefMapper.updateSort(enterpriseId, storeBrandId, sort + 1d);
         }
     }
 
@@ -148,10 +162,7 @@ public class StoreBrandServiceImpl implements StoreBrandService {
                 } else {
                     sort = (list.get(0).getSort() + list.get(1).getSort()) / 2d;
                 }
-                TabStoreBrand tabStoreBrand = new TabStoreBrand();
-                tabStoreBrand.setStoreBrandId(storeBrandId);
-                tabStoreBrand.setSort(sort);
-                tabStoreBrandMapper.updateByPrimaryKeySelective(tabStoreBrand);
+                tabStoreBrandRefMapper.updateSort(enterpriseId, storeBrandId, sort);
             }
         }
     }

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

@@ -8,15 +8,18 @@
     <result column="store_brand_category_code" jdbcType="VARCHAR" property="storeBrandCategoryCode" />
     <result column="store_brand_category" jdbcType="VARCHAR" property="storeBrandCategory" />
     <result column="sort" jdbcType="DOUBLE" property="sort" />
-    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="has_rel" jdbcType="INTEGER" property="hasRel" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </resultMap>
   <sql id="Base_Column_List">
-    store_brand_id, store_brand_code, store_brand_name, store_brand_category_code, store_brand_category, 
-    sort, enterprise_id, delete_flag, create_time, update_time, has_rel
+    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
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -30,13 +33,11 @@
   </delete>
   <insert id="insert" parameterType="com.gic.store.entity.TabStoreBrand">
     insert into tab_store_brand (store_brand_id, store_brand_code, store_brand_name, 
-      store_brand_category_code, store_brand_category, 
-      sort, enterprise_id, delete_flag,
+      store_brand_category_code, store_brand_category, delete_flag,
       create_time, update_time, has_rel
       )
     values (#{storeBrandId,jdbcType=INTEGER}, #{storeBrandCode,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, 
-      #{storeBrandCategoryCode,jdbcType=VARCHAR}, #{storeBrandCategory,jdbcType=VARCHAR}, 
-      #{sort,jdbcType=DOUBLE}, #{enterpriseId,jdbcType=INTEGER}, #{deleteFlag,jdbcType=INTEGER},
+      #{storeBrandCategoryCode,jdbcType=VARCHAR}, #{storeBrandCategory,jdbcType=VARCHAR},  #{deleteFlag,jdbcType=INTEGER},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{hasRel,jdbcType=INTEGER}
       )
   </insert>
@@ -61,12 +62,6 @@
       <if test="storeBrandCategory != null">
         store_brand_category,
       </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="enterpriseId != null">
-        enterprise_id,
-      </if>
       <if test="deleteFlag != null">
         delete_flag,
       </if>
@@ -96,12 +91,6 @@
       <if test="storeBrandCategory != null">
         #{storeBrandCategory,jdbcType=VARCHAR},
       </if>
-      <if test="sort != null">
-        #{sort,jdbcType=DOUBLE},
-      </if>
-      <if test="enterpriseId != null">
-        #{enterpriseId,jdbcType=INTEGER},
-      </if>
       <if test="deleteFlag != null">
         #{deleteFlag,jdbcType=INTEGER},
       </if>
@@ -134,9 +123,6 @@
       <if test="sort != null">
         sort = #{sort,jdbcType=DOUBLE},
       </if>
-      <if test="enterpriseId != null">
-        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
-      </if>
       <if test="deleteFlag != null">
         delete_flag = #{deleteFlag,jdbcType=INTEGER},
       </if>
@@ -158,8 +144,6 @@
       store_brand_name = #{storeBrandName,jdbcType=VARCHAR},
       store_brand_category_code = #{storeBrandCategoryCode,jdbcType=VARCHAR},
       store_brand_category = #{storeBrandCategory,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=DOUBLE},
-      enterprise_id = #{enterpriseId,jdbcType=INTEGER},
       delete_flag = #{deleteFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -167,69 +151,64 @@
     where store_brand_id = #{storeBrandId,jdbcType=INTEGER}
   </update>
 
-  <select id="getMinSort" resultType="java.lang.Double">
-    select sort from tab_store_brand where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort limit 0, 1
-  </select>
-  <select id="getMaxSort" resultType="java.lang.Double">
-    select sort from tab_store_brand where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort desc limit 0, 1
-  </select>
+
   <select id="countBySelective" resultType="java.lang.Integer">
-    select count(1) from tab_store_brand
-    where delete_flag = 0
+    select count(1) from tab_store_brand t1,tab_store_brand_ref t2
+    where t2.delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
     <if test="enterpriseId != null ">
-      and enterprise_id = #{enterpriseId}
+      and t2.enterprise_id = #{enterpriseId}
     </if>
 <!--    &lt;if test="storeBrandCode != null and storeBrandCode != '' "&gt;-->
 <!--      and store_brand_code = #{storeBrandCode}-->
 <!--    &lt;/if&gt;-->
     <if test="storeBrandName != null and storeBrandName != '' ">
-      and store_brand_name = #{storeBrandName}
+      and t1.store_brand_name = #{storeBrandName}
     </if>
     <if test="storeBrandId != null ">
-      and store_brand_id &lt;&gt; #{storeBrandId}
+      and t1.store_brand_id &lt;&gt; #{storeBrandId}
     </if>
   </select>
   <select id="listStoreBrand" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
+    <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where t2.delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
     <if test="enterpriseId != null ">
-      and enterprise_id = #{enterpriseId}
+      and t2.enterprise_id = #{enterpriseId}
     </if>
     <if test="search != null and search != '' ">
-      and ( store_brand_code like concat('%', #{search}, '%') or store_brand_name like concat('%', #{search}, '%') )
+      and ( t1.store_brand_code like concat('%', #{search}, '%') or t1.store_brand_name like concat('%', #{search}, '%') )
     </if>
     order by sort
   </select>
   <select id="getPrevSort" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
-    and enterprise_id = #{enterpriseId}
-    and sort &lt; #{sort}
-    order by sort desc
+    <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
+    and t2.enterprise_id = #{enterpriseId}
+    and t2.sort &lt; #{sort}
+    order by t2.sort desc
     limit 0, 1
   </select>
   <select id="getNextSort" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
-    and enterprise_id = #{enterpriseId}
-    and sort &gt; #{sort}
-    order by sort
+    <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
+    and t2.enterprise_id = #{enterpriseId}
+    and t2.sort &gt; #{sort}
+    order by t2.sort
     limit 0, 1
   </select>
   <select id="listTwoElementExceptId" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
-    and enterprise_id = #{enterpriseId}
-    and store_brand_id &lt;&gt; #{storeBrandId}
-    order by sort
+    <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where t2.delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id
+    and t2.enterprise_id = #{enterpriseId}
+    and t1.store_brand_id &lt;&gt; #{storeBrandId}
+    order by t2.sort
     limit #{start}, #{size}
   </select>
   <update id="deleteByIds">
@@ -246,24 +225,24 @@
   <select id="listStoreBrandByIds" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
+    from tab_store_brand t1
+    where t1.delete_flag =0
     <if test="null != ids and ids.size() &gt; 0">
-      and store_brand_id in
+      and t1.store_brand_id in
       <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
         #{item}
       </foreach>
     </if>
-    order by sort
+    order by t1.store_brand_id
   </select>
   <select id="getByStoreBrandName" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
-    from tab_store_brand
-    where delete_flag = 0
-    and enterprise_id = #{enterpriseId}
+    <include refid="Ref_Column_List" />
+    from tab_store_brand t1, tab_store_brand_ref t2
+    where t2.delete_flag = 0 and t1.delete_flag =0 and t1.store_brand_id = t2.store_brand_id and t2.enterprise_id=#{enterpriseId}
     <if test="storeBrandName != null ">
-        and store_brand_name = #{storeBrandName}
+        and t1.store_brand_name = #{storeBrandName}
     </if>
   </select>
+
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.store.dao.mapper.TabStoreBrandRefMapper">
+  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabStoreBrandRef">
+    <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="type" jdbcType="INTEGER" property="type" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+    <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
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_store_brand_ref
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_store_brand_ref
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <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)
+    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})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.store.entity.TabStoreBrandRef">
+    insert into tab_store_brand_ref
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="storeBrandId != null">
+        store_brand_id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="storeBrandId != null">
+        #{storeBrandId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=DOUBLE},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabStoreBrandRef">
+    update tab_store_brand_ref
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="storeBrandId != null">
+        store_brand_id = #{storeBrandId,jdbcType=INTEGER},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=DOUBLE},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabStoreBrandRef">
+    update tab_store_brand_ref
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      store_brand_id = #{storeBrandId,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=DOUBLE}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getMinSort" resultType="java.lang.Double">
+    select sort from tab_store_brand_ref where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort limit 0, 1
+  </select>
+  <select id="getMaxSort" resultType="java.lang.Double">
+    select sort from tab_store_brand_ref where delete_flag = 0 and enterprise_id = #{enterpriseId} order by sort desc limit 0, 1
+  </select>
+
+  <select id="selectByEidAndBrandId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_store_brand_ref
+    where enterprise_id= #{enterpriseId} and store_brand_id=#{storeBrandId} and delete_flag = 0
+  </select>
+
+  <update id="updateSort">
+    update tab_store_brand_ref set sort = #{sort}
+    where enterprise_id=#{enterpriseId} and store_brand_id = #{storeBrandId} and delete_flag = 0
+  </update>
+</mapper>
\ No newline at end of file