Merge remote-tracking branch 'origin/developer' into developer

gic-store-api/src/main/java/com/gic/store/service/StoreGroupApiService.java

@@ -175,4 +175,6 @@ public interface StoreGroupApiService {
     */
     ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
                                                              Integer parentId, String search, Integer pageSize, Integer pageNum);
+
+    ServiceResponse<List<StoreGroupDTO>> listChildrenStoreGroup(Integer enterpriseId, Integer parentStoreGroupId);
 }

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

@@ -197,4 +197,6 @@ public interface StoreGroupService {
     List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level);
 
     Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId, String search);
+
+    List<TabStoreGroup> listChildrenStoreGroup(Integer enterpriseId, Integer parentStoreGroupId);
 }

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

@@ -169,4 +169,13 @@ public class StoreGroupServiceImpl implements StoreGroupService{
         return this.tabStoreGroupMapper.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId, search);
     }
 
+    @Override
+    public List<TabStoreGroup> listChildrenStoreGroup(Integer enterpriseId, Integer parentStoreGroupId) {
+        TabStoreGroup param = new TabStoreGroup();
+        param.setEnterpriseId(enterpriseId);
+        param.setParentStoreGroupId(parentStoreGroupId);
+        List<TabStoreGroup> tabStoreGroupList = tabStoreGroupMapper.listStoreGroup(param);
+        return tabStoreGroupList;
+    }
+
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreGroupApiServiceImpl.java

@@ -373,6 +373,12 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
         return ServiceResponse.success(storeGroupDTOPage);
     }
 
+    @Override
+    public ServiceResponse<List<StoreGroupDTO>> listChildrenStoreGroup(Integer enterpriseId, Integer parentStoreGroupId) {
+        List<TabStoreGroup> list = this.storeGroupService.listChildrenStoreGroup(enterpriseId, parentStoreGroupId);
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(StoreGroupDTO.class, list));
+    }
+
     /**
      * 刷新缓存，删除缓存
      * @param storeGroupId

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

@@ -179,6 +179,9 @@
     <if test="groupLevel != null and groupLevel != '' ">
       and group_level = #{groupLevel}
     </if>
+    <if test="parentStoreGroupId !=null and parentStoreGroupId != ''">
+      and parent_store_group_id = #{parentStoreGroupId}
+    </if>
     order by group_level, sort
   </select>