From 67de527c09cc8663837a6a6dd547f8f3764d5a1d Mon Sep 17 00:00:00 2001 From: Caps <452713115@qq.com> Date: Tue, 28 Apr 2020 13:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=AE=A1=E7=90=86=E9=9B=B6?= =?UTF-8?q?=E5=94=AE=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/RetailCompanyService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 8e5bc74..cdf57b7 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -326,27 +326,27 @@ public class RetailCompanyService { List list1 = selectShopByCompany(org.getId()); List stores = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); - //根据门店查询导购人数 - QueryWrapper wrapperStaff = new QueryWrapper<>(); - wrapperStaff.in("store_id",stores); - List listStaff = poiStoreStaffDOMapper.selectList(wrapperStaff); +// //根据门店查询导购人数 +// QueryWrapper wrapperStaff = new QueryWrapper<>(); +// wrapperStaff.in("store_id",stores); +// List listStaff = poiStoreStaffDOMapper.selectList(wrapperStaff); //组织成员的客户个数 QueryWrapper wrapper2 = new QueryWrapper<>(); - wrapper2.in("user_id", listStaff.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())); - List opRelations = listStaff.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectList(wrapper2); + wrapper2.in("store_id", stores); + List opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2); long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); organizationalVO.setAllCustomer((int) count); //组织成员的客户有效个数 QueryWrapper wrapper4 = new QueryWrapper<>(); - wrapper4.in("user_id", listStaff.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())); + wrapper4.in("store_id", stores); wrapper4.eq("type", 1); - List opRelations1 = listStaff.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectList(wrapper4); + List opRelations1 = opSellerCustomerRelationDOMapper.selectList(wrapper4); long countAble = opRelations1.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count(); organizationalVO.setEffectiveCustomer((int) countAble); //计算新增客户数据 - newCustomerUser(startTime, endTime, organizationalVO, listStaff.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())); + newCustomerStore(startTime, endTime, organizationalVO, stores); //被拉黑的客户数 QueryWrapper wrapper3 = new QueryWrapper<>();