diff --git a/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java b/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java index 37b4a49..2657b60 100644 --- a/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java +++ b/src/main/java/com/kiisoo/ic/department/controller/DepartmentController.java @@ -108,4 +108,6 @@ public class DepartmentController extends BaseController { return fail(); } } + + } diff --git a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java index e1e8ca9..d4b1ac7 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java @@ -29,31 +29,31 @@ public class PoiStoreController extends BaseController { private PoiStoreService poiStoreService; - /** * 根据用户id,区域id获取店铺 + * * @return */ - @RequestMapping(value = "/user/shop",method = RequestMethod.POST) + @RequestMapping(value = "/user/shop", method = RequestMethod.POST) @ResponseBody - public Map getUserShop(@RequestParam("userId")long userId, @RequestParam(value = "customerIds",required =false)String customerIds){ + public Map getUserShop(@RequestParam("userId") long userId, @RequestParam(value = "customerIds", required = false) String customerIds) { try { List customers = null; - if (StringUtils.isNotBlank(customerIds)){ + if (StringUtils.isNotBlank(customerIds)) { String[] split = customerIds.replace("[", "").replace("]", "").split(","); List strings = Arrays.asList(split); - if (CollectionUtils.isNotEmpty(strings)){ + if (CollectionUtils.isNotEmpty(strings)) { customers = new ArrayList<>(); - for (String customerId:strings){ - if (StringUtils.isNotBlank(customerId)){ + for (String customerId : strings) { + if (StringUtils.isNotBlank(customerId)) { customers.add(Long.parseLong(customerId)); } } } } - return data(poiStoreService.getRegionShop(userId,customers)); - }catch (Exception e){ - log.error("获取用户店铺失败",e); + return data(poiStoreService.getRegionShop(userId, customers)); + } catch (Exception e) { + log.error("获取用户店铺失败", e); return fail(); } @@ -61,32 +61,34 @@ public class PoiStoreController extends BaseController { /** * 根据用户id,区域id获取店铺 + * * @return */ - @RequestMapping(value = "/user/shopDTO",method = RequestMethod.POST) + @RequestMapping(value = "/user/shopDTO", method = RequestMethod.POST) @ResponseBody - public Map getUserShopDTO(@RequestParam("userId")long userId, @RequestParam(value = "customerIds",required =false)String customerIds){ + public Map getUserShopDTO(@RequestParam("userId") long userId, @RequestParam(value = "customerIds", required = false) String customerIds) { try { List customers = null; - if (StringUtils.isNotBlank(customerIds)){ + if (StringUtils.isNotBlank(customerIds)) { String[] split = customerIds.replace("[", "").replace("]", "").split(","); List strings = Arrays.asList(split); - if (CollectionUtils.isNotEmpty(strings)){ + if (CollectionUtils.isNotEmpty(strings)) { customers = new ArrayList<>(); - for (String customerId:strings){ - if (StringUtils.isNotBlank(customerId)){ + for (String customerId : strings) { + if (StringUtils.isNotBlank(customerId)) { customers.add(Long.parseLong(customerId)); } } } } - return data(poiStoreService.getRegionShopDTO(userId,customers)); - }catch (Exception e){ - log.error("获取用户店铺失败",e); + return data(poiStoreService.getRegionShopDTO(userId, customers)); + } catch (Exception e) { + log.error("获取用户店铺失败", e); return fail(); } } + /** * 查询所有店铺 * @@ -105,4 +107,23 @@ public class PoiStoreController extends BaseController { } + /** + * 通过公司查询店铺 + * + * @return 店铺信息 + */ + @RequestMapping(value = "/org/list", method = RequestMethod.GET) + @ResponseBody + public Map orgList(@RequestParam("departmentIdList") String departmentIdList) { + + try { + List shops = poiStoreService.organizationalList(departmentIdList); + return data(shops); + } catch (Exception e) { + log.error("查询店铺出错", e); + return fail(); + } + } + + } diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java index cffdeb3..64185e1 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java @@ -86,4 +86,10 @@ public interface PoiStoreDOMapper extends BaseMapper { */ PrivilageOrganizational findStoreCompany(@Param("storeId") Long storeId); + /*** + *通过公司查询 + * @param organizationalIdList + * @return + */ + List organizationalList(@Param("organizationalIdList") String organizationalIdList); } diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index 5deca0e..70ce254 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -53,40 +53,43 @@ public class PoiStoreService { private PrivilageOrganizationalDomainMapper privilageOrganizationalDomainMapper; @Autowired private RetailCompanyMapper retailCompanyMapper; + /** * 根据区域id找到店铺集合 + * * @param regionId */ - public List getRegionShop(long regionId){ + public List getRegionShop(long regionId) { List poiStores = poiStoreDOMapper.selectRegionShop(regionId); return poiStores; } /** * 根据区域id找到店铺集合,若没有,则查用户所有店铺 + * * @param regionId */ - public List getRegionShop(long userId,List customerIds){ + public List getRegionShop(long userId, List customerIds) { List poiStores = new ArrayList<>(); //找到店铺集合 List shopsIds = privilageDomainService.listUserDatePermission(userId); - if(null != customerIds && customerIds.size()>0){ + if (null != customerIds && customerIds.size() > 0) { Set shopIds = new HashSet<>(); customerIds.forEach(customerId -> { - Set shops = customerViewService.getCompanyShop(customerId,userId); - if (CollectionUtils.isNotEmpty(shops)){ + Set shops = customerViewService.getCompanyShop(customerId, userId); + if (CollectionUtils.isNotEmpty(shops)) { shopIds.addAll(shops); } }); - if(shopIds.size() > 0){ + if (shopIds.size() > 0) { List regionPoiStores = poiStoreDOMapper.selectBatchIds(shopIds); - for(PoiStore item : regionPoiStores){ - if(shopsIds.contains(item.getId())){ + for (PoiStore item : regionPoiStores) { + if (shopsIds.contains(item.getId())) { poiStores.add(item); } } } - }else{ + } else { poiStores = poiStoreDOMapper.selectBatchIds(shopsIds); } return poiStores; @@ -94,12 +97,13 @@ public class PoiStoreService { /** * 根据区域id找到店铺集合,若没有,则查用户所有店铺 + * * @param regionId */ - public List getRegionShopDTO(long userId,List customerIds){ + public List getRegionShopDTO(long userId, List customerIds) { List poiStores = new ArrayList<>(); //找到店铺集合 - if(null != customerIds && customerIds.size()>0){ + if (null != customerIds && customerIds.size() > 0) { Set cs = new HashSet<>(); cs.addAll(customerIds); Set childs = retailCompanyMapper.selectChildList(cs); @@ -107,14 +111,15 @@ public class PoiStoreService { Set domainIds = domains.stream().map(PrivilageOrganizationalDomain::getDomainId).collect(Collectors.toSet()); List entityDOS = privilageDomainEntityDOMapper.selectList(Wrappers.lambdaQuery().in(PrivilageDomainEntityDO::getDomainId, domainIds).eq(PrivilageDomainEntityDO::getType, 3).select(PrivilageDomainEntityDO::getEntityId)); Set shopIds = entityDOS.stream().map(PrivilageDomainEntityDO::getEntityId).collect(Collectors.toSet()); - if(shopIds.size() > 0){ + if (shopIds.size() > 0) { poiStores = poiStoreDOMapper.selectDTOBatchIds(shopIds); } - }else{ + } else { poiStores = poiStoreDOMapper.selectDTOBatchIds(privilageDomainService.listUserDatePermission(userId)); } return poiStores; } + /** * 查询所有店铺 * @@ -127,22 +132,29 @@ public class PoiStoreService { /** * 根据区域id找到店铺集合,若没有,则查用户所有店铺 + * * @param companyId 零售公司ID */ - public List getStoreByCompanyId(long userId,Long companyId){ + public List getStoreByCompanyId(long userId, Long companyId) { List poiStores = new ArrayList<>(); //找到店铺集合 List shopsIds = privilageDomainService.listUserDatePermission(userId); - if(!companyId.equals(0L)){ - Set shops = customerViewService.getCompanyShop(companyId,userId); - if(shops.size() > 0){ + if (!companyId.equals(0L)) { + Set shops = customerViewService.getCompanyShop(companyId, userId); + if (shops.size() > 0) { List regionPoiStores = poiStoreDOMapper.selectBatchIds(shops); List intersection = regionPoiStores.stream().filter(item -> shops.contains(item.getId())).collect(toList()); return intersection; } - }else{ + } else { poiStores = poiStoreDOMapper.selectBatchIds(shopsIds); } return poiStores; } + + + public List organizationalList(String organizationalIdList) { + + return poiStoreDOMapper.organizationalList(organizationalIdList); + } } diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index 8dd5031..dfdaad9 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -208,35 +208,54 @@ + + + +