Merge branch 'developer' into 'master'

Developer

See merge request !23

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

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-15 16:55
+ */
+public class ClerkPositionDTO implements Serializable {
+
+    private static final long serialVersionUID = -1393821407141417895L;
+    /**
+     *
+     */
+    private Integer clerkPositionId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    private String positionName;
+
+    /**
+     *
+     */
+    private String positionCode;
+
+    /**
+     *
+     */
+    private Double sort;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+    private int seq;
+
+    public Integer getClerkPositionId() {
+        return clerkPositionId;
+    }
+
+    public void setClerkPositionId(Integer clerkPositionId) {
+        this.clerkPositionId = clerkPositionId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public String getPositionCode() {
+        return positionCode;
+    }
+
+    public void setPositionCode(String positionCode) {
+        this.positionCode = positionCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    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 getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    public int getSeq() {
+        return seq;
+    }
+}

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

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+public class StoreColumnSet implements Serializable {
+    private Set<Integer> storeType = new HashSet<>();
+    private Set<Integer> status = new HashSet<>();
+    private Set<Integer> ErpStatus = new HashSet<>();
+    private Set<Integer> storeGroupId = new HashSet<>();
+    private Set<Integer> region = new HashSet<>();
+
+    public Set<Integer> getStoreType() {
+        return storeType;
+    }
+
+    public void setStoreType(Set<Integer> storeType) {
+        this.storeType = storeType;
+    }
+
+    public Set<Integer> getStatus() {
+        return status;
+    }
+
+    public void setStatus(Set<Integer> status) {
+        this.status = status;
+    }
+
+    public Set<Integer> getErpStatus() {
+        return ErpStatus;
+    }
+
+    public void setErpStatus(Set<Integer> erpStatus) {
+        ErpStatus = erpStatus;
+    }
+
+    public Set<Integer> getStoreGroupId() {
+        return storeGroupId;
+    }
+
+    public void setStoreGroupId(Set<Integer> storeGroupId) {
+        this.storeGroupId = storeGroupId;
+    }
+
+    public Set<Integer> getRegion() {
+        return region;
+    }
+
+    public void setRegion(Set<Integer> region) {
+        this.region = region;
+    }
+}

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

@@ -14,7 +14,7 @@ public class StoreSearchDBDTO implements Serializable {
     private Integer regionId;
     private Integer storeInfoId;
     private Integer storeId;
-    private Integer overflowStatus=0;
+    private Integer overflowStatus;
     private Integer enterpriseId;
     private Integer storeBrandId;
     private String longitude = "0";

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

@@ -28,6 +28,7 @@ public class StoreSearchDTO implements Serializable {
     private Integer storeTagId;
     private Integer completeStatus;
     private List<Integer> storeResourceList;
+    private Integer erpStatus;
 
     public Integer getStoreGroupId() {
         return storeGroupId;
@@ -222,4 +223,13 @@ public class StoreSearchDTO implements Serializable {
     public void setStoreResourceList(List<Integer> storeResourceList) {
         this.storeResourceList = storeResourceList;
     }
+
+    public Integer getErpStatus() {
+        return erpStatus;
+    }
+
+    public StoreSearchDTO setErpStatus(Integer erpStatus) {
+        this.erpStatus = erpStatus;
+        return this;
+    }
 }

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

+package com.gic.store.service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.store.dto.ClerkPositionDTO;
+
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-15 16:55
+ */
+public interface ClerkPositionApiService {
+
+    /**
+     * @Title: save
+     * @Description:
+     * @author zhiwj
+     * @param clerkPositionDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> save(ClerkPositionDTO clerkPositionDTO);
+    
+    /**
+     * @Title: update
+     * @Description: 
+     * @author zhiwj 
+     * @param clerkPositionDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws 
+     */
+    ServiceResponse<Void> update(ClerkPositionDTO clerkPositionDTO);
+
+    /**
+     * @Title: getByClerkPositionId
+     * @Description: 
+     * @author zhiwj 
+     * @param clerkPositionId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ClerkPositionDTO>
+     * @throws 
+     */
+    ServiceResponse<ClerkPositionDTO> getByClerkPositionId(Integer clerkPositionId);
+
+    /**
+     * @Title: delete
+     * @Description:
+     * @author zhiwj
+     * @param clerkPositionId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
+    ServiceResponse<Void> delete(Integer clerkPositionId);
+
+    /**
+     * @Title: listClerkPosition
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param search
+     * @param currentPage
+     * @param pageSize
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.store.dto.ClerkPositionDTO>>
+     * @throws
+     */
+    ServiceResponse<Page<ClerkPositionDTO>> listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize);
+
+    /**
+     * @Title: listAllClerkPosition
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param search
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.ClerkPositionDTO>>
+     * @throws
+     */
+    ServiceResponse<List<ClerkPositionDTO>> listAllClerkPosition(Integer enterpriseId, String search);
+
+    /**
+     * @Title: setSort
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param clerkPositionId
+     * @param seq
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws 
+     */
+    ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq);
+}

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

@@ -2,6 +2,7 @@ package com.gic.store.service;
 
 import java.util.List;
 
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.store.dto.StoreGroupDTO;
 
@@ -156,4 +157,22 @@ public interface StoreGroupApiService {
      * @return 
     */
     ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId);
+
+    /** @Description: 通过分组id查询分组
+     * @author taogs
+     * @Date 18:44 2019/8/12
+     * @Param
+     * @return
+     */
+    ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level);
+
+    
+    /** @Description: 分页查询分组
+     * @author taogs
+     * @Date 10:31 2020/7/15
+     * @Param 
+     * @return 
+    */
+    ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
+                                                             Integer parentId, String search, Integer pageSize, Integer pageNum);
 }

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

@@ -3,6 +3,7 @@ package com.gic.store.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.store.dto.StoreBrandDTO;
+import com.gic.store.dto.StoreColumnSet;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreWidgetDTO;
 
@@ -86,4 +87,7 @@ public interface StoreWidgetApiService {
      * @return result true表示存在
      */
     ServiceResponse existByStoreInfoId(Integer enterpriseId, Integer storeWidgetId, Integer storeInfoId);
+
+
+    ServiceResponse<StoreColumnSet> getStoreColumnSet(Integer enterpriseId, Integer storeWidgetId);
 }

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

@@ -58,7 +58,7 @@ public interface TabClerkMapper {
 
     Integer countByPhoneNumber(@Param("storeId") Integer storeId, @Param("phoneNumber") String phoneNumber, @Param("clerkId") Integer clerkId);
 
-    List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("storeInfoIds") String storeInfoIds, @Param("search") String search, @Param("clerkType") Integer clerkType);
+    List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("storeInfoIds") String storeInfoIds, @Param("search") String search, @Param("clerkType") Integer clerkType, @Param("status") Integer status);
 
     Integer getTotalClerk(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search);
 

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

+package com.gic.store.dao.mapper;
+
+import com.gic.store.entity.TabClerkPosition;
+import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface TabClerkPositionMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param clerkPositionId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer clerkPositionId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabClerkPosition record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabClerkPosition record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param clerkPositionId 主键
+     * @return 实体对象
+     */
+    TabClerkPosition selectByPrimaryKey(Integer clerkPositionId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabClerkPosition record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabClerkPosition record);
+
+    TabClerkPosition getSelective(TabClerkPosition tabClerkPosition);
+
+    Page<TabClerkPosition> listClerkPosition(@Param("enterpriseId") Integer enterpriseId, @Param("search") String search);
+
+    Double getMinSort(@Param("enterpriseId") Integer enterpriseId);
+
+    Double getMaxSort(@Param("enterpriseId") Integer enterpriseId);
+
+    List<TabClerkPosition> listTwoElementExceptId(@Param("enterpriseId") Integer enterpriseId, @Param("start") int start, @Param("size") int size, @Param("clerkPositionId") Integer clerkPositionId);
+}
\ No newline at end of file

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

 package com.gic.store.dao.mapper;
 
 import com.gic.store.entity.TabStoreGroup;
+import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -127,5 +128,12 @@ public interface TabStoreGroupMapper {
      */
     TabStoreGroup selectUnGroupedStore(@Param("enterpriseId") Integer enterpriseId);
 
-    List<TabStoreGroup> listStoreGroupByIds(@Param("storeGroupIdList") List<Integer> storeGroupIdList, @Param("enterpriseId") Integer enterpriseId);
+    List<TabStoreGroup> listStoreGroupByIds(@Param("storeGroupIdList") List<Integer> storeGroupIdList,
+                                            @Param("enterpriseId") Integer enterpriseId,
+                                            @Param("level") Integer level);
+
+    Page<TabStoreGroup> pageStoreGroupByIds(@Param("storeGroupIdList") List<Integer> storeGroupIdList,
+                                            @Param("enterpriseId") Integer enterpriseId,
+                                            @Param("parentId") Integer parentId,
+                                            @Param("search") String search);
 }
\ No newline at end of file

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

+package com.gic.store.entity;
+
+import java.util.Date;
+
+/**
+ * tab_clerk_position
+ */
+public class TabClerkPosition {
+    /**
+     * 
+     */
+    private Integer clerkPositionId;
+
+    /**
+     * 
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 
+     */
+    private String positionName;
+
+    /**
+     * 
+     */
+    private String positionCode;
+
+    /**
+     * 
+     */
+    private Double sort;
+
+    /**
+     * 
+     */
+    private Date createTime;
+
+    /**
+     * 
+     */
+    private Date updateTime;
+
+    /**
+     * 
+     */
+    private Integer status;
+
+    public Integer getClerkPositionId() {
+        return clerkPositionId;
+    }
+
+    public void setClerkPositionId(Integer clerkPositionId) {
+        this.clerkPositionId = clerkPositionId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public String getPositionCode() {
+        return positionCode;
+    }
+
+    public void setPositionCode(String positionCode) {
+        this.positionCode = positionCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    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 getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
\ No newline at end of file

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

+package com.gic.store.service;
+
+import com.gic.store.dto.ClerkPositionDTO;
+import com.gic.store.entity.TabClerkPosition;
+import com.github.pagehelper.Page;
+
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-15 17:08
+ */
+public interface ClerkPositionService {
+    boolean isPositionNameRepeat(Integer enterpriseId, String positionName, Integer clerkPositionId);
+
+    boolean isPositionCodeRepeat(Integer enterpriseId, String positionCode, Integer clerkPositionId);
+
+    void save(ClerkPositionDTO clerkPositionDTO);
+
+    void update(ClerkPositionDTO clerkPositionDTO);
+
+    TabClerkPosition getByClerkPositionId(Integer clerkPositionId);
+
+    Page<TabClerkPosition> listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize);
+
+    List<TabClerkPosition> listAllClerkPosition(Integer enterpriseId, String search);
+
+    void deleteById(Integer clerkPositionId);
+
+    void setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq);
+
+    void sortTopping(Integer enterpriseId, Integer clerkPositionId);
+
+    void sortBottom(Integer enterpriseId, Integer clerkPositionId);
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.gic.store.dto.StoreGroupDTO;
 import com.gic.store.entity.TabStoreGroup;
+import com.github.pagehelper.Page;
 
 /**
  * 门店分组
@@ -193,5 +194,7 @@ public interface StoreGroupService {
     
 */
     TabStoreGroup selectAllStoreGroup(Integer enterpriseId);
 
-    List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId);
+    List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level);
+
+    Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId, String search);
 }

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

+package com.gic.store.service.impl;
+
+import com.gic.commons.util.EntityUtil;
+import com.gic.store.dao.mapper.TabClerkPositionMapper;
+import com.gic.store.dto.ClerkPositionDTO;
+import com.gic.store.entity.TabClerkPosition;
+import com.gic.store.service.ClerkPositionService;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-15 17:08
+ */
+@Service
+public class ClerkPositionServiceImpl implements ClerkPositionService {
+
+    @Autowired
+    private TabClerkPositionMapper tabClerkPositionMapper;
+
+    @Override
+    public boolean isPositionNameRepeat(Integer enterpriseId, String positionName, Integer clerkPositionId) {
+        TabClerkPosition tabClerkPosition = new TabClerkPosition();
+        tabClerkPosition.setEnterpriseId(enterpriseId);
+        tabClerkPosition.setPositionName(positionName);
+        tabClerkPosition.setClerkPositionId(clerkPositionId);
+        return tabClerkPositionMapper.getSelective(tabClerkPosition) != null;
+    }
+
+    @Override
+    public boolean isPositionCodeRepeat(Integer enterpriseId, String positionCode, Integer clerkPositionId) {
+        TabClerkPosition tabClerkPosition = new TabClerkPosition();
+        tabClerkPosition.setEnterpriseId(enterpriseId);
+        tabClerkPosition.setPositionName(positionCode);
+        tabClerkPosition.setClerkPositionId(clerkPositionId);
+        return tabClerkPositionMapper.getSelective(tabClerkPosition) != null;
+    }
+
+    @Override
+    public void save(ClerkPositionDTO clerkPositionDTO) {
+        TabClerkPosition clerkPosition = EntityUtil.changeEntityByJSON(TabClerkPosition.class, clerkPositionDTO);
+        clerkPosition.setCreateTime(new Date());
+        clerkPosition.setStatus(1);
+        Double sort = tabClerkPositionMapper.getMinSort(clerkPositionDTO.getEnterpriseId());
+        clerkPosition.setSort(sort == null ? 1d : sort - 1d);
+        tabClerkPositionMapper.insertSelective(clerkPosition);
+    }
+
+    @Override
+    public void update(ClerkPositionDTO clerkPositionDTO) {
+        TabClerkPosition clerkPosition = EntityUtil.changeEntityByJSON(TabClerkPosition.class, clerkPositionDTO);
+        tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
+    }
+
+    @Override
+    public TabClerkPosition getByClerkPositionId(Integer clerkPositionId) {
+        return tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
+    }
+
+    @Override
+    public Page<TabClerkPosition> listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize) {
+        PageHelper.startPage(currentPage, pageSize);
+        return tabClerkPositionMapper.listClerkPosition(enterpriseId, search);
+    }
+
+    @Override
+    public Page<TabClerkPosition> listAllClerkPosition(Integer enterpriseId, String search) {
+        return tabClerkPositionMapper.listClerkPosition(enterpriseId, search);
+    }
+
+    @Override
+    public void deleteById(Integer clerkPositionId) {
+        TabClerkPosition clerkPosition = new TabClerkPosition();
+        clerkPosition.setClerkPositionId(clerkPositionId);
+        clerkPosition.setStatus(0);
+        tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
+    }
+
+    @Override
+    public void setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq) {
+
+        if (seq <= 3) {
+            // 相当于置顶
+            sortTopping(enterpriseId, clerkPositionId);
+        } else {
+            int start = seq - 2;
+            int size = 2;
+
+            List<TabClerkPosition> list = tabClerkPositionMapper.listTwoElementExceptId(enterpriseId, start, size, clerkPositionId);
+            if (CollectionUtils.isEmpty(list)) {
+                // 置底
+                sortBottom(enterpriseId, clerkPositionId);
+            } else {
+                Double sort;
+                if (list.size() == 1) {
+                    // 置底
+                    sort = list.get(0).getSort() + 1d;
+                } else {
+                    sort = (list.get(0).getSort() + list.get(1).getSort()) / 2d;
+                }
+                TabClerkPosition clerkPosition = new TabClerkPosition();
+                clerkPosition.setClerkPositionId(clerkPositionId);
+                clerkPosition.setSort(sort);
+                tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
+            }
+        }
+    }
+
+    @Override
+    public void sortTopping(Integer enterpriseId, Integer clerkPositionId) {
+        Double sort = tabClerkPositionMapper.getMinSort(enterpriseId);
+        TabClerkPosition clerkPosition = new TabClerkPosition();
+        clerkPosition.setClerkPositionId(clerkPositionId);
+        clerkPosition.setSort(sort - 1d);
+        tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
+    }
+
+    @Override
+    public void sortBottom(Integer enterpriseId, Integer clerkPositionId) {
+        Double sort = tabClerkPositionMapper.getMaxSort(enterpriseId);
+        if (sort != null) {
+            TabClerkPosition clerkPosition = new TabClerkPosition();
+            clerkPosition.setClerkPositionId(clerkPositionId);
+            clerkPosition.setSort(sort + 1d);
+            tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
+        }
+    }
+}

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

@@ -97,17 +97,17 @@ public class ClerkServiceImpl implements ClerkService {
 
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search) {
-        return this.listClerkByStoreInfoId(enterpriseId, storeInfoIds, search, null);
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, null, 1);
     }
 
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String storeInfoIds, String search) {
-        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, null);
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, null, null);
     }
 
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search, Integer clerkType) {
-        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, clerkType);
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, clerkType, null);
     }
 
     @Override
@@ -151,7 +151,7 @@ public class ClerkServiceImpl implements ClerkService {
 
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String search) {
-        return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, null, search, null);
+        return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, null, search, null, null);
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.gic.store.dao.mapper.TabStoreGroupMapper;
 import com.gic.store.dto.StoreGroupDTO;
 import com.gic.store.entity.TabStoreGroup;
 import com.gic.store.service.StoreGroupService;
+import com.github.pagehelper.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -159,8 +160,13 @@ public class StoreGroupServiceImpl implements StoreGroupService{
     }
 
     @Override
-    public List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId) {
-        return this.tabStoreGroupMapper.listStoreGroupByIds(storeGroupIdList, enterpriseId);
+    public List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level) {
+        return this.tabStoreGroupMapper.listStoreGroupByIds(storeGroupIdList, enterpriseId, level);
+    }
+
+    @Override
+    public Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId, String search){
+        return this.tabStoreGroupMapper.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId, search);
     }
 
 }

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

@@ -218,6 +218,7 @@ public class StoreServiceImpl implements StoreService {
         store.setEnterpriseId(enterpriseId);
         store.setStoreName(storeName);
         store.setStoreInfoId(storeId);
+        store.setOverflowStatus(0);
         return tabStoreInfoMapper.countBySelective(store);
     }
 

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

+package com.gic.store.service.outer.impl;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.store.dto.ClerkPositionDTO;
+import com.gic.store.entity.TabClerkPosition;
+import com.gic.store.service.ClerkPositionApiService;
+import com.gic.store.service.ClerkPositionService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("clerkPositionApiService")
+public class ClerkPositionApiServiceImpl implements ClerkPositionApiService {
+
+    @Autowired
+    private ClerkPositionService clerkPositionService;
+
+    @Override
+    public ServiceResponse<Void> save(ClerkPositionDTO clerkPositionDTO) {
+        // 校验参数
+        if (clerkPositionService.isPositionNameRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionName(), null)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色名称错误");
+        }
+        if (clerkPositionService.isPositionCodeRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionCode(), null)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色代码错误");
+        }
+        // 保存实体
+        clerkPositionService.save(clerkPositionDTO);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> update(ClerkPositionDTO clerkPositionDTO) {
+        if (clerkPositionService.isPositionNameRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionName(), clerkPositionDTO.getClerkPositionId())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色名称错误");
+        }
+        if (clerkPositionService.isPositionCodeRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionCode(), clerkPositionDTO.getClerkPositionId())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色代码错误");
+        }
+        // 保存实体
+        clerkPositionService.update(clerkPositionDTO);
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<ClerkPositionDTO> getByClerkPositionId(Integer clerkPositionId) {
+        TabClerkPosition clerkPosition = this.clerkPositionService.getByClerkPositionId(clerkPositionId);
+        ClerkPositionDTO clerkPositionDTO = EntityUtil.changeEntityByJSON(ClerkPositionDTO.class, clerkPosition);
+        return EnterpriseServiceResponse.success(clerkPositionDTO);
+    }
+
+    @Override
+    public ServiceResponse<Page<ClerkPositionDTO>> listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize) {
+        com.github.pagehelper.Page<TabClerkPosition> clerkPositionList = clerkPositionService.listClerkPosition(enterpriseId, search, currentPage, pageSize);
+        Page<ClerkPositionDTO> clerkPositionDTOPage = PageHelperUtils.changePageHelperToCurrentPage(clerkPositionList, ClerkPositionDTO.class);
+        if (CollectionUtils.isNotEmpty(clerkPositionList)) {
+            List<ClerkPositionDTO> positionDTOList = clerkPositionDTOPage.getResult();
+            for (int i = 0; i < positionDTOList.size(); i++) {
+                positionDTOList.get(i).setSeq(i + 1);
+            }
+        }
+        return EnterpriseServiceResponse.success(clerkPositionDTOPage);
+    }
+
+    @Override
+    public ServiceResponse<List<ClerkPositionDTO>> listAllClerkPosition(Integer enterpriseId, String search) {
+        List<TabClerkPosition> clerkPositionList = clerkPositionService.listAllClerkPosition(enterpriseId, search);
+        return EnterpriseServiceResponse.success(EntityUtil.changeEntityListByJSON(ClerkPositionDTO.class, clerkPositionList));
+    }
+
+    @Override
+    public ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq) {
+        clerkPositionService.setSort(enterpriseId, clerkPositionId, seq);
+        return EnterpriseServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> delete(Integer clerkPositionId) {
+        TabClerkPosition clerkPosition = this.clerkPositionService.getByClerkPositionId(clerkPositionId);
+        if (clerkPosition == null) {
+            return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "数据不存在或已删除");
+        }
+        this.clerkPositionService.deleteById(clerkPositionId);
+        return EnterpriseServiceResponse.success();
+    }
+
+}
\ No newline at end of file

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

@@ -611,7 +611,6 @@ public class StoreApiServiceImpl implements StoreApiService {
         dynamicSearchDTO.setReturnFileds(returnFileds);
         logger.info("es查询条件：{}", JSON.toJSONString(dynamicSearchDTO,true));
         ServiceResponse<ESResponseQueryBatchDTO> response = this.esBusinessOperaApiService.queryDataBatch(dynamicSearchDTO, false, null);
-        logger.info("es查询结果：,{}", response.getResult().getRes().size());
         return response;
     }
 
@@ -1480,6 +1479,11 @@ public class StoreApiServiceImpl implements StoreApiService {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.STATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getStatus());
             jsonObjectList.add(json);
         }
+        //门店状态
+        if (storeSearchDTO.getErpStatus() != null) {
+            json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.ERPSTATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getErpStatus());
+            jsonObjectList.add(json);
+        }
         if (storeSearchDTO.getCompleteStatus() != null) {
             json = QueryConditionAssemblyUtil.createSimpleQueryNode(StoreESFieldsEnum.COMPLETESTATUS.getField(), OperateEnum.OPERATE_EQ, storeSearchDTO.getCompleteStatus());
             jsonObjectList.add(json);

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

@@ -7,7 +7,10 @@ import java.util.Stack;
 import java.util.concurrent.TimeUnit;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.store.service.StoreApiService;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -351,10 +354,25 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
 
     @Override
     public ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId) {
-        List<TabStoreGroup> list = this.storeGroupService.listStoreGroupByIds(storeGroupIdList, enterpriseId);
+        List<TabStoreGroup> list = this.storeGroupService.listStoreGroupByIds(storeGroupIdList, enterpriseId, null);
         return ServiceResponse.success(EntityUtil.changeEntityListByJSON(StoreGroupDTO.class, list));
     }
 
+    @Override
+    public ServiceResponse<List<StoreGroupDTO>> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level) {
+        List<TabStoreGroup> list = this.storeGroupService.listStoreGroupByIds(storeGroupIdList, enterpriseId, level);
+        return ServiceResponse.success(EntityUtil.changeEntityListByJSON(StoreGroupDTO.class, list));
+    }
+
+    @Override
+    public ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
+                                                                    Integer parentId, String search, Integer pageSize, Integer pageNum) {
+        PageHelper.startPage(pageNum, pageSize);
+        com.github.pagehelper.Page<TabStoreGroup> tabStoreGroups = this.storeGroupService.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId, search);
+        Page<StoreGroupDTO> storeGroupDTOPage = PageHelperUtils.changePageHelperToCurrentPage(tabStoreGroups, StoreGroupDTO.class);
+        return ServiceResponse.success(storeGroupDTOPage);
+    }
+
     /**
      * 刷新缓存，删除缓存
      * @param storeGroupId

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

@@ -6,10 +6,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.store.constant.StoreESFieldsEnum;
-import com.gic.store.dto.StoreBrandDTO;
-import com.gic.store.dto.StoreDTO;
-import com.gic.store.dto.StoreSearchDTO;
-import com.gic.store.dto.StoreWidgetDTO;
+import com.gic.store.dto.*;
 import com.gic.store.entity.TabStoreBrand;
 import com.gic.store.service.StoreApiService;
 import com.gic.store.service.StoreBrandService;
@@ -232,6 +229,36 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
         }
         return ServiceResponse.success(false);
     }
+
+    @Override
+    public ServiceResponse<StoreColumnSet> getStoreColumnSet(Integer enterpriseId, Integer storeWidgetId) {
+        StoreColumnSet storeColumnSet = new StoreColumnSet();
+        this.getStoreColumnSet(enterpriseId, storeWidgetId, 1, storeColumnSet);
+        return ServiceResponse.success(storeColumnSet);
+    }
+
+    private void getStoreColumnSet(Integer enterpriseId, Integer storeWidgetId, int pageNum, StoreColumnSet storeColumnSet){
+        ServiceResponse<Page<StoreDTO>> response = this.listStoreByStoreWidgetId(enterpriseId, storeWidgetId, pageNum, 10000);
+        if(response.isSuccess() && response.getResult() != null){
+            Page<StoreDTO> page = response.getResult();
+            List<StoreDTO> result = page.getResult();
+            if(CollectionUtils.isNotEmpty(result)){
+                for(StoreDTO storeDTO : result){
+                    storeColumnSet.getErpStatus().add(storeDTO.getErpStatus());
+                    storeColumnSet.getRegion().add(storeDTO.getRegionId());
+                    storeColumnSet.getStatus().add(storeDTO.getStatus());
+                    storeColumnSet.getStoreGroupId().addAll(storeDTO.getStoreGroupIdList());
+                    storeColumnSet.getStoreType().add(storeDTO.getStoreType());
+                }
+            }
+            if(pageNum == 1 && page.getPages() > 1){
+                for(int i=2; i<= page.getPages(); i++){
+                    this.getStoreColumnSet(enterpriseId, storeWidgetId, i, storeColumnSet);
+                }
+            }
+        }
+    }
+
     private void getStoreId(Integer enterpriseId, Integer storeWidgetId, int pageNum, List<Integer> list){
         ServiceResponse<Page<Integer>> response = this.listStoreIdByStoreWidgetId(enterpriseId, storeWidgetId, pageNum, 10000);
         if(response.isSuccess() && response.getResult() != null){

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

@@ -47,6 +47,7 @@
     <dubbo:service interface="com.gic.store.service.ClerkImportApiService" ref="clerkImportApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.ClerkTaskApiService" ref="clerkTaskApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.ClerkLogApiService" ref="clerkLogApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.store.service.ClerkPositionApiService" ref="clerkPositionApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreWidgetApiService" ref="storeWidgetApiService" timeout="6000" />
     <dubbo:service interface="com.gic.store.service.StoreAuthorizationApiService" ref="storeAuthorizationApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="6000" />

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

@@ -253,6 +253,9 @@
     <if test="clerkType != null ">
         and clerk_type = #{clerkType}
     </if>
+    <if test="status != null ">
+        and status = #{status}
+    </if>
   </select>
   <select id="getTotalClerk" resultType="int">
     select

gic-store-service/src/main/resources/mapper/TabClerkPositionMapper.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.TabClerkPositionMapper">
+  <resultMap id="BaseResultMap" type="com.gic.store.entity.TabClerkPosition">
+    <id column="clerk_position_id" jdbcType="INTEGER" property="clerkPositionId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="position_name" jdbcType="VARCHAR" property="positionName" />
+    <result column="position_code" jdbcType="VARCHAR" property="positionCode" />
+    <result column="sort" jdbcType="DOUBLE" property="sort" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    clerk_position_id, enterprise_id, position_name, position_code, sort, create_time, 
+    update_time, status
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_clerk_position
+    where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_clerk_position
+    where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.store.entity.TabClerkPosition">
+    insert into tab_clerk_position (clerk_position_id, enterprise_id, position_name, 
+      position_code, sort, create_time, 
+      update_time, status)
+    values (#{clerkPositionId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{positionName,jdbcType=VARCHAR}, 
+      #{positionCode,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.store.entity.TabClerkPosition">
+    insert into tab_clerk_position
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="clerkPositionId != null">
+        clerk_position_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="positionName != null">
+        position_name,
+      </if>
+      <if test="positionCode != null">
+        position_code,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="clerkPositionId != null">
+        #{clerkPositionId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="positionName != null">
+        #{positionName,jdbcType=VARCHAR},
+      </if>
+      <if test="positionCode != null">
+        #{positionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=DOUBLE},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabClerkPosition">
+    update tab_clerk_position
+    <set>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="positionName != null">
+        position_name = #{positionName,jdbcType=VARCHAR},
+      </if>
+      <if test="positionCode != null">
+        position_code = #{positionCode,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=DOUBLE},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+    </set>
+    where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabClerkPosition">
+    update tab_clerk_position
+    set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      position_name = #{positionName,jdbcType=VARCHAR},
+      position_code = #{positionCode,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=DOUBLE},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER}
+    where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
+  </update>
+  <select id="getSelective" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_clerk_position where status = 1
+    <if test="enterpriseId != null ">
+        and enterprise_id = #{enterpriseId}
+    </if>
+    <if test="positionName != null ">
+        and position_name = #{positionName}
+    </if>
+    <if test="positionCode != null ">
+        and position_code = #{positionCode}
+    </if>
+    <if test="clerkPositionId != null ">
+        and clerk_position_id &lt;&gt; #{clerkPositionId}
+    </if>
+  </select>
+  <select id="listClerkPosition" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_clerk_position where status = 1
+    and ( enterprise_id = #{enterpriseId} or enterprise_id is null )
+    <if test="search != null and search != '' ">
+        and ( position_name like concat('%', #{search}, '%') or position_code like concat('%', #{search}, '%') )
+    </if>
+    order by sort
+  </select>
+  <select id="getMinSort" resultType="double">
+    select sort from tab_clerk_position where status = 1 and enterprise_id = #{enterpriseId} order by sort limit 1
+  </select>
+  <select id="getMaxSort" resultType="double">
+    select sort from tab_clerk_position where status = 1 and enterprise_id = #{enterpriseId} order by sort desc limit 1
+  </select>
+  <select id="listTwoElementExceptId" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_clerk_position
+    where status = 1
+    and enterprise_id = #{enterpriseId}
+    and clerk_position_id &lt;&gt; #{clerkPositionId}
+    order by sort
+    limit #{start}, #{size}
+  </select>
+</mapper>
\ No newline at end of file

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

@@ -259,6 +259,7 @@
         #{item}
       </foreach>
     </if>
+    group by a.store_field_id
     order by a.sort
   </select>
 

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

@@ -272,5 +272,29 @@
         #{item}
       </foreach>
     </if>
+    <if test="level != null">
+      and group_level = #{level}
+    </if>
+  </select>
+  <select id="pageStoreGroupByIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from
+    tab_store_group where status = 1 and enterprise_id = #{enterpriseId}
+    <if test="null != storeGroupIdList and storeGroupIdList.size() > 0">
+      and store_group_id in
+      <foreach collection="storeGroupIdList" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    <if test="parentId != null and parentId !=''">
+      and parent_store_group_id = #{parentId}
+    </if>
+    <if test="parentId == null or parentId = ''">
+      and group_level = 1
+    </if>
+    <if test="search != null and search != ''">
+      and store_group_name like concat('%', #{search}, '%')
+    </if>
   </select>
 </mapper>
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkPositionController.java

+package com.gic.store.web.controller;
+
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.utils.ResultControllerUtils;
+import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.store.dto.ClerkPositionDTO;
+import com.gic.store.service.ClerkPositionApiService;
+import com.gic.store.web.qo.clerk.ClerkPositionQO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-16 14:29
+ */
+@RestController
+public class ClerkPositionController {
+
+    @Autowired
+    private ClerkPositionApiService clerkPositionApiService;
+
+    @RequestMapping("/save-clerk-position")
+    public RestResponse saveClerkPosition(@Validated(ClerkPositionQO.SaveValidView.class) ClerkPositionQO clerkPositionQO) {
+        clerkPositionQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        ServiceResponse<Void> serviceResponse = clerkPositionApiService.save(EntityUtil.changeEntityByJSON(ClerkPositionDTO.class, clerkPositionQO));
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/update-clerk-position")
+    public RestResponse updateClerkPosition(@Validated(ClerkPositionQO.EditValidView.class) ClerkPositionQO clerkPositionQO) {
+        clerkPositionQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
+        ServiceResponse<Void> serviceResponse = clerkPositionApiService.update(EntityUtil.changeEntityByJSON(ClerkPositionDTO.class, clerkPositionQO));
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/get-by-clerk-position-id")
+    public RestResponse getByClerkPositionId(Integer clerkPositionId) {
+        ServiceResponse<ClerkPositionDTO> serviceResponse = clerkPositionApiService.getByClerkPositionId(clerkPositionId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/delete-by-clerk-position-id")
+    public RestResponse deleteByClerkPositionId(Integer clerkPositionId) {
+        ServiceResponse<Void> serviceResponse = clerkPositionApiService.delete(clerkPositionId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/list-clerk-position")
+    public RestResponse listClerkPosition(Integer enterpriseId, String search, Integer currentPage, Integer pageSize) {
+        ServiceResponse<Page<ClerkPositionDTO>> serviceResponse = clerkPositionApiService.listClerkPosition(enterpriseId, search, currentPage, pageSize);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+    @RequestMapping("/list-all-clerk-position")
+    public RestResponse listAllClerkPosition(Integer enterpriseId, String search) {
+        ServiceResponse<List<ClerkPositionDTO>> serviceResponse = clerkPositionApiService.listAllClerkPosition(enterpriseId, search);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
+
+}

gic-store-web/src/main/java/com/gic/store/web/qo/clerk/ClerkPositionQO.java

+package com.gic.store.web.qo.clerk;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-07-16 14:35
+ */
+public class ClerkPositionQO implements Serializable {
+    private static final long serialVersionUID = -1393821407141417895L;
+
+    public interface SaveValidView{
+    }
+    public interface EditValidView{
+    }
+
+    /**
+     *
+     */
+    @NotNull(message = "导购名称不能为空", groups = EditValidView.class)
+    private Integer clerkPositionId;
+
+    /**
+     *
+     */
+    private Integer enterpriseId;
+
+    /**
+     *
+     */
+    @NotNull(message = "导购名称不能为空", groups = {SaveValidView.class, EditValidView.class})
+    private String positionName;
+
+    /**
+     *
+     */
+    @NotNull(message = "导购代码不能为空", groups = {SaveValidView.class, EditValidView.class})
+    private String positionCode;
+
+    /**
+     *
+     */
+    private Double sort;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Integer status;
+    private int seq;
+
+    public Integer getClerkPositionId() {
+        return clerkPositionId;
+    }
+
+    public void setClerkPositionId(Integer clerkPositionId) {
+        this.clerkPositionId = clerkPositionId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getPositionName() {
+        return positionName;
+    }
+
+    public void setPositionName(String positionName) {
+        this.positionName = positionName;
+    }
+
+    public String getPositionCode() {
+        return positionCode;
+    }
+
+    public void setPositionCode(String positionCode) {
+        this.positionCode = positionCode;
+    }
+
+    public Double getSort() {
+        return sort;
+    }
+
+    public void setSort(Double sort) {
+        this.sort = sort;
+    }
+
+    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 getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setSeq(int seq) {
+        this.seq = seq;
+    }
+
+    public int getSeq() {
+        return seq;
+    }
+}

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

@@ -41,6 +41,7 @@
     <dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.ClerkImportApiService" id="clerkImportApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.ClerkLogApiService" id="clerkLogApiService" timeout="60000" />
+    <dubbo:reference interface="com.gic.store.service.ClerkPositionApiService" id="clerkPositionApiService" timeout="60000" />
     <!-- 平台品牌 -->
     <dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="60000" />
     <dubbo:reference interface="com.gic.store.service.StoreAuthorizationApiService" id="storeAuthorizationApiService" timeout="60000" />