Skip to content

H
haoban-manage3.0
Commit 5027f7ef by huangZW
Options

1111

parent ccebbe96
Showing with 74 additions and 70 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
......@@ -29,7 +29,7 @@ public interface DepartmentApiService {
* @return
*/
Page<DepartmentDTO> pageFullStoreByWxEnterpriseId(
String wxEnterpriseId, String search,int count,BasePageInfo pageInfo);
String wxEnterpriseId, String search,List<String> storeId,int count,BasePageInfo pageInfo);
/**
* 根据部门id查询部门
* @param departmentId
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java
......@@ -38,7 +38,7 @@ public interface DepartmentMapper {
TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
Page<TabHaobanDepartment> pageFullStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("search")String search,@Param("minCount")int minCount);
Page<TabHaobanDepartment> pageFullStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId,@Param("search")String search,@Param("storeIds")List<String> storeIds,@Param("minCount")int minCount);
TabHaobanDepartment getByRelatedId(@Param("relatedId")String relatedId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
......@@ -239,9 +239,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
@Override
public Page<DepartmentDTO> pageFullStoreByWxEnterpriseId(
String wxEnterpriseId,String search, int count,BasePageInfo pageInfo) {
String wxEnterpriseId,String search,List<String> storeIds, int count,BasePageInfo pageInfo) {
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
return PageUtil.changePageHelperToCurrentPage( departmentMapper.pageFullStoreByWxEnterpriseId(wxEnterpriseId,search,count),DepartmentDTO.class);
return PageUtil.changePageHelperToCurrentPage( departmentMapper.pageFullStoreByWxEnterpriseId(wxEnterpriseId,search, storeIds,count),DepartmentDTO.class);
}
@Override
......
haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml
......@@ -303,6 +303,12 @@
<if test="search != null and search != ''">
and department_name like CONCAT('%',#{search},'%')
</if>
<if test="storeIds != null and storeIds.size != 0">
and related_id IN
<foreach collection="storeIds" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
</if>
order by create_time
) t WHERE t.rownum > #{minCount}
</select>
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java
......@@ -398,65 +398,5 @@ public class DepartmentContoller extends WebBaseController{
}
}
//溢出门店列表
@IgnoreLogin
@RequestMapping("store-full-list")
public HaobanResponse storeFullList(BasePageInfo basePageInfo,String search) {
// LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
// String wxEnterpriseId = login.getWxEnterpriseId();
String wxEnterpriseId = "1";
int maxVersionCount = 0;
Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,maxVersionCount, basePageInfo);
List<DepartmentDTO> list = page.getResult();
List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
List<String> storeIds = list.stream().map(s->s.getRelatedId()).collect(Collectors.toList());
String [] storeIdArr = storeIds.toArray(new String[storeIds.size()]);
List<StoreDTO> storeList = storeService.getStores(storeIdArr);
Map<String,StoreDTO> map = com.gic.commons.util.CollectionUtil.toMap(storeList, "storeId");
for(StoreVo vo:resultList){
if(map.get(vo.getRelatedId())!=null){
vo.setStoreCode(map.get(vo.getDepartmentId()).getStoreCode());
vo.setStoreId(map.get(vo.getDepartmentId()).getStoreId());
}
}
Page resultPage = new Page<>();
resultPage.setCurrentPage(page.getCurrentPage());
resultPage.setPageSize(page.getPageSize());
resultPage.setTotalCount(page.getTotalCount());
resultPage.setResult(resultList);
return resultResponse(HaoBanErrCode.ERR_1,resultPage);
/*int pageNum = basePageInfo.getPageNum();
int pageSize = basePageInfo.getPageSize();
Page<DepartmentDTO> page = new Page<>(pageNum, pageSize, 0);
//TODO　获取版本容量
int maxSize = 0;
List<DepartmentDTO> list = departmentApiService.listStoreByWxEnterpriseId(wxEnterpriseId);
if(list == null||list.size()==0){
return resultResponse(HaoBanErrCode.ERR_1,new Page<>());
}
page.setTotalCount(list.size());
if(maxSize != 0){
if(list.size() <= maxSize){
//小于版本容量（无溢出门店）
return resultResponse(HaoBanErrCode.ERR_1,new Page<>());
}else{
//大于版本容量（有溢出门店）
list = list.subList(maxSize,list.size()-1);
}
}
List resultList = ListUtils.Pager(pageSize, pageNum, list);
return resultResponse(HaoBanErrCode.ERR_1,resultList);*/
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
package com.gic.haoban.manage.web.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collector;
......@@ -12,12 +13,19 @@ import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.druid.util.StringUtils;
import com.gic.api.base.commons.Page;
import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.HaobanResponse;
import com.gic.haoban.manage.api.dto.DepartmentDTO;
import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.web.anno.HttpLimit;
......@@ -25,6 +33,7 @@ import com.gic.haoban.manage.web.anno.IgnoreLogin;
import com.gic.haoban.manage.web.auth.AuthRequestUtil;
import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
import com.gic.haoban.manage.web.vo.LoginVO;
import com.gic.haoban.manage.web.vo.StoreVo;
@RestController
public class WxEnterpriseController extends WebBaseController{
......@@ -34,6 +43,10 @@ public class WxEnterpriseController extends WebBaseController{
private EnterpriseService enterpriseService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private StoreService storeService;
//授权企业列表
@HttpLimit
......@@ -88,6 +101,49 @@ public class WxEnterpriseController extends WebBaseController{
return resultResponse(HaoBanErrCode.ERR_1);
}
//溢出门店列表
@IgnoreLogin
@RequestMapping("store-full-list")
public HaobanResponse storeFullList(BasePageInfo basePageInfo,String search) {
// LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
// String wxEnterpriseId = login.getWxEnterpriseId();
String wxEnterpriseId = "1";
int maxVersionCount = 0;
List<String> storeIds = new ArrayList<String>();
List<EnterpriseDetailDTO> enterpriseList = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
if(CollectionUtil.isEmpty(enterpriseList)){
return resultResponse(HaoBanErrCode.ERR_10010);
}
List<String> enterpriseIds = enterpriseList.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
//TODO 调陶接口，获取store列表
Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,storeIds,maxVersionCount, basePageInfo);
List<DepartmentDTO> list = page.getResult();
List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
List<String> t_storeIds = list.stream().map(s->s.getRelatedId()).collect(Collectors.toList());
String [] storeIdArr = t_storeIds.toArray(new String[t_storeIds.size()]);
List<StoreDTO> storeList = storeService.getStores(storeIdArr);
Map<String,StoreDTO> map = com.gic.commons.util.CollectionUtil.toMap(storeList, "storeId");
for(StoreVo vo:resultList){
if(map.get(vo.getRelatedId())!=null){
vo.setStoreCode(map.get(vo.getDepartmentId()).getStoreCode());
vo.setStoreId(map.get(vo.getDepartmentId()).getStoreId());
vo.setStoreName(map.get(vo.getDepartmentId()).getStoreName());
}
}
Page resultPage = new Page<>();
resultPage.setCurrentPage(page.getCurrentPage());
resultPage.setPageSize(page.getPageSize());
resultPage.setTotalCount(page.getTotalCount());
resultPage.setResult(resultList);
return resultResponse(HaoBanErrCode.ERR_1,resultPage);
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
......@@ -78,6 +78,7 @@ public enum HaoBanErrCode {
ERR_10008(10008,"请不要过于频繁点击"),
ERR_10009(10009,"门店不存在"),
ERR_10010(10010,"企业微信无关联的gic企业"),
ERR_DEFINE(-888, "自定义错误"),
ERR_OTHER(-999, "未知错误code");
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StoreVo.java
......@@ -13,7 +13,7 @@ public class StoreVo implements Serializable {
*/
private static final long serialVersionUID = 1L;
private String departmentId;
private String departmentName;
private String storeName;
private String storeId;
private String storeCode;
private String relatedId;
......@@ -30,11 +30,12 @@ public class StoreVo implements Serializable {
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
public String getDepartmentName() {
return departmentName;
public String getStoreName() {
return storeName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreId() {
return storeId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment