门店品牌变更

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

@@ -105,15 +105,15 @@ public interface TabStoreMapper {
     List<TabStore> getStoreNoStatus(@Param("enterpriseId") Integer enterpriseId, @Param("storeInfoId") Integer storeInfoId);
 
     /**
-     * listStoreIdByFromEnterpriseId
-     * @Title: listStoreIdByFromEnterpriseId
+     * listShareStoreId
+     * @Title: listShareStoreId
      * @Description:
      * @author zhiwj
-     * @param fromEnterpriseId
+     * @param enterpriseId
      * @return java.util.List<java.lang.Integer>
      * @throws
      */
-    List<Integer> listStoreIdByFromEnterpriseId(@Param("fromEnterpriseId") Integer fromEnterpriseId);
+    List<Integer> listShareStoreId(@Param("enterpriseId") Integer enterpriseId);
 
     /**
      * cancelAuthStore

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

@@ -341,15 +341,15 @@ public interface StoreService {
     int authAddStore(StoreDTO storeDTO);
 
     /**
-     * listStoreIdByFromEnterpriseId
-     * @Title: listStoreIdByFromEnterpriseId
-     * @Description:
+     * listShareStoreId
+     * @Title: listShareStoreId
+     * @Description:  查询当前商户下的共享门店
      * @author zhiwj
-     * @param fromEnterpriseId
+     * @param enterpriseId
      * @return java.util.List<java.lang.Integer>
      * @throws
      */
-    List<Integer> listStoreIdByFromEnterpriseId(Integer fromEnterpriseId);
+    List<Integer> listShareStoreId(Integer enterpriseId);
 
     /**
      * cancelAuthStore

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

@@ -485,8 +485,8 @@ public class StoreServiceImpl implements StoreService {
     }
 
     @Override
-    public List<Integer> listStoreIdByFromEnterpriseId(Integer fromEnterpriseId) {
-        return this.tabStoreMapper.listStoreIdByFromEnterpriseId(fromEnterpriseId);
+    public List<Integer> listShareStoreId(Integer enterpriseId) {
+        return this.tabStoreMapper.listShareStoreId(enterpriseId);
     }
 
     @Override

gic-store-service/src/main/resources/dubbo-gic-store-service.xml

@@ -74,4 +74,5 @@
     <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.auth.service.UserResourceApiService" id="userResourceApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.api.service.StoreUpdateApiService" id="storeUpdateApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.enterprise.service.UnionEnterpriseAuthResDetailApiService" id="unionEnterpriseAuthResDetailApiService" timeout="6000"/>
 </beans>

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

@@ -192,11 +192,11 @@
         where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and store_info_id=#{storeInfoId}
         order by status desc,create_time desc
     </select>
-    <select id="listStoreIdByFromEnterpriseId" resultType="java.lang.Integer">
+    <select id="listShareStoreId" resultType="java.lang.Integer">
         select
         store_info_id
         from tab_store
-        where from_enterprise_id = #{fromEnterpriseId,jdbcType=INTEGER} and status=1 and own_type=1
+        where from_enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1 and own_type=1
     </select>
     <update id="cancelAuthStore">
         update tab_store set status=0 where enterprise_id=#{toEnterpriseId} and status=1