From 648a3f3cc430be066a2ec668f9547034827cc7f4 Mon Sep 17 00:00:00 2001 From: Caps <452713115@qq.com> Date: Fri, 24 Apr 2020 23:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=9E=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/RetailCompanyService.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index ef666bc..65ebf32 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -92,13 +92,13 @@ public class RetailCompanyService { List pm = organizationalMemberMapper.selectList(wrapper1); QueryWrapper wrapper = new QueryWrapper<>(); if (check(userId)) { - wrapper.eq("level", level).eq("type", 1).eq("status", 1); + wrapper.eq("level", level).eq("type", 2).eq("status", 1); return retailCompanyMapper.selectList(wrapper); } if (pm.isEmpty()) { return new ArrayList<>(); } else { - wrapper.eq("type", 1).eq("status", 1).eq("level", level). + wrapper.eq("type", 2).eq("status", 1).eq("level", level). in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId). collect(Collectors.toList())); if (null != parentId) { @@ -117,13 +117,13 @@ public class RetailCompanyService { List pm = organizationalMemberMapper.selectList(wrapper1); QueryWrapper wrapper = new QueryWrapper<>(); if (check(userId)) { - wrapper.eq("type", 1).eq("level", 1).eq("status", 1); + wrapper.eq("type", 2).eq("level", 1).eq("status", 1); return retailCompanyMapper.selectList(wrapper); } if (pm.isEmpty()) { return new ArrayList<>(); } else { - wrapper.eq("type", 1).eq("level", 1).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList())); + wrapper.eq("type", 2).eq("level", 1).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList())); return retailCompanyMapper.selectList(wrapper); } } @@ -199,7 +199,7 @@ public class RetailCompanyService { if (pm.isEmpty()) { return new ArrayList<>(); } else { - wrapper.eq("type", 1).eq("level", 2).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList())); + wrapper.eq("type", 2).eq("level", 2).eq("status", 1).in("id", pm.stream().map(PrivilageOrganizationalMember::getOrgId).collect(Collectors.toList())); if (bigRegionId != null) { wrapper.eq("parent_id", bigRegionId); } @@ -269,10 +269,11 @@ public class RetailCompanyService { public OrganizationVO generalizeOfRetail(String startTime, String endTime, Long orgId, int pageNum, int pageSize) { //零售公司信息 QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("type", 1).eq("status", 1); + wrapper.eq("type", 2).eq("level",2).eq("status", 1); if (orgId != null) { wrapper.eq("id", orgId); } + PageHelper.startPage(pageNum, pageSize); List listOfOrg = retailCompanyMapper.selectList(wrapper); @@ -284,7 +285,6 @@ public class RetailCompanyService { //查询零售公司的门店 List list1 = selectShopByCompany(org.getId()); List stores = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); - //组织成员 QueryWrapper wrapper1 = new QueryWrapper<>(); wrapper1.eq("org_id", org.getId()); @@ -292,14 +292,14 @@ public class RetailCompanyService { //组织成员的客户个数 QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.in("user_id", memberList.stream().map(PrivilageOrganizationalMember::getUserId).collect(Collectors.toList())); - List opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2); + List opRelations = memberList.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectList(wrapper2); long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); organizationalVO.setAllCustomer((int) count); //组织成员的客户有效个数 QueryWrapper wrapper4 = new QueryWrapper<>(); wrapper4.in("user_id", memberList.stream().map(PrivilageOrganizationalMember::getUserId).collect(Collectors.toList())); wrapper4.eq("type", 1); - List opRelations1 = opSellerCustomerRelationDOMapper.selectList(wrapper4); + List opRelations1 = memberList.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectList(wrapper4); long countAble = opRelations1.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); organizationalVO.setEffectiveCustomer((int) countAble); @@ -340,6 +340,9 @@ public class RetailCompanyService { * @param organizationalVO 封装实体 */ private void newCustomerUser(String startTime, String endTime, DataVO organizationalVO, List userIds) { + if(userIds.size() == 0){ + return; + } //最初时间的总客户人数 QueryWrapper wrapper2 = new QueryWrapper<>(); wrapper2.in("user_id", userIds); @@ -448,15 +451,15 @@ public class RetailCompanyService { //查询所有的店铺信息 QueryWrapper poiStoreQueryWrapper = new QueryWrapper<>(); poiStoreQueryWrapper.in("id", shopIds); - List list2 = poiStoreDOMapper.selectList(poiStoreQueryWrapper); + List list2 = shopIds.size() == 0 ? new ArrayList<>() : poiStoreDOMapper.selectList(poiStoreQueryWrapper); Map map = list2.stream().collect(Collectors.toMap(PoiStore::getId, p -> p)); //所有的导购客户个数 - List> map1 = opSellerCustomerRelationDOMapper.selectAllCustomerShop(shopIds); + List> map1 = shopIds.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectAllCustomerShop(shopIds); Map collect = map1 == null ? new HashMap<>() : map1.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("store_id").toString()), m1 -> m1.get("count"))); - List> map2 = opSellerCustomerRelationDOMapper.selectAllCustomerShop1(shopIds); + List> map2 = shopIds.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectAllCustomerShop1(shopIds); Map collect1 = map2 == null ? new HashMap<>() : map2.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("store_id").toString()), m1 -> m1.get("count"))); List list1 = new ArrayList<>();