Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/dto/open/StoreGroupDTO.java

+package com.gic.store.dto.open;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 开放api门店分组查询接口
+ * @ClassName: StoreGroupDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/22 5:07 PM

+ */
+public class StoreGroupDTO implements Serializable{
+    private static final long serialVersionUID = -2710703586504765462L;
+
+    /**
+     *
+     */
+    private Integer storeGroupId;
+
+    /**
+     * 分组名称
+     */
+    private String storeGroupName;
+
+    /**
+     * 父级分组id
+     */
+    private Integer parentStoreGroupId;
+
+    /**
+     * 分组层级
+     */
+    private Integer groupLevel;
+
+    /**
+     * 分组排序
+     */
+    private Integer sort;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+    /**
+     * 是否是默认门店，初始化品牌的时候会建立一条默认门店：未分组门店，1:是 0:否
+     */
+    private Integer isDefault;
+
+    public Integer getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public StoreGroupDTO setStoreGroupId(Integer storeGroupId) {
+        this.storeGroupId = storeGroupId;
+        return this;
+    }
+
+    public String getStoreGroupName() {
+        return storeGroupName;
+    }
+
+    public StoreGroupDTO setStoreGroupName(String storeGroupName) {
+        this.storeGroupName = storeGroupName;
+        return this;
+    }
+
+    public Integer getParentStoreGroupId() {
+        return parentStoreGroupId;
+    }
+
+    public StoreGroupDTO setParentStoreGroupId(Integer parentStoreGroupId) {
+        this.parentStoreGroupId = parentStoreGroupId;
+        return this;
+    }
+
+    public Integer getGroupLevel() {
+        return groupLevel;
+    }
+
+    public StoreGroupDTO setGroupLevel(Integer groupLevel) {
+        this.groupLevel = groupLevel;
+        return this;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public StoreGroupDTO setSort(Integer sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public StoreGroupDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public StoreGroupDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    public Integer getIsDefault() {
+        return isDefault;
+    }
+
+    public StoreGroupDTO setIsDefault(Integer isDefault) {
+        this.isDefault = isDefault;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "StoreGroupDTO{" +
+                "storeGroupId=" + storeGroupId +
+                ", storeGroupName='" + storeGroupName + '\'' +
+                ", parentStoreGroupId=" + parentStoreGroupId +
+                ", groupLevel=" + groupLevel +
+                ", sort=" + sort +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", isDefault=" + isDefault +
+                '}';
+    }
+}

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

@@ -171,4 +171,15 @@ public interface StoreOpenApiService {
      * @throws
      */
     ServiceResponse<String> listField(String appId, Integer enterpriseId, Integer regionId);
+
+    /**
+     * 查询门店分组数据
+     * @Title: listStoreGroup

+     * @Description:
+    
* @author guojuxing
+     * @param appId
+     * @param enterpriseId
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

+    
*/
+    ServiceResponse<String> listStoreGroup(String appId, Integer enterpriseId);
 }

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

@@ -678,6 +678,18 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         }
     }
 
+    @Override
+    @GatewayParams(query = {"appId", "enterpriseId"})
+    public ServiceResponse<String> listStoreGroup(String appId, Integer enterpriseId) {
+        //查询全部
+        List<TabStoreGroup> list = this.storeGroupService.listStoreGroupByIds(null, enterpriseId, null);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<com.gic.store.dto.open.StoreGroupDTO> result = EntityUtil.changeEntityListNew(com.gic.store.dto.open.StoreGroupDTO.class, list);
+            return ServiceResponse.success(JSON.toJSONString(result, true));
+        }
+        return ServiceResponse.success();
+    }
+
 
 
     /**