客户回调接口

src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java

@@ -92,13 +92,13 @@ public class RetailCompanyService {
         List<PrivilageOrganizationalMember> pm = organizationalMemberMapper.selectList(wrapper1);
         QueryWrapper<PrivilageOrganizational> 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<PrivilageOrganizationalMember> pm = organizationalMemberMapper.selectList(wrapper1);
         QueryWrapper<PrivilageOrganizational> 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<PrivilageOrganizational> 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<PrivilageOrganizational> listOfOrg = retailCompanyMapper.selectList(wrapper);
 
@@ -284,7 +285,6 @@ public class RetailCompanyService {
             //查询零售公司的门店
             List<PoiStore> list1 = selectShopByCompany(org.getId());
             List<Long> stores = list1.stream().map(PoiStore::getId).collect(Collectors.toList());
-
             //组织成员
             QueryWrapper<PrivilageOrganizationalMember> wrapper1 = new QueryWrapper<>();
             wrapper1.eq("org_id", org.getId());
@@ -292,14 +292,14 @@ public class RetailCompanyService {
             //组织成员的客户个数
             QueryWrapper<OpSellerCustomerRelation> wrapper2 = new QueryWrapper<>();
             wrapper2.in("user_id", memberList.stream().map(PrivilageOrganizationalMember::getUserId).collect(Collectors.toList()));
-            List<OpSellerCustomerRelation> opRelations = opSellerCustomerRelationDOMapper.selectList(wrapper2);
+            List<OpSellerCustomerRelation> opRelations = memberList.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectList(wrapper2);
             long count = opRelations.stream().map(OpSellerCustomerRelation::getCustomerId).distinct().count();
             organizationalVO.setAllCustomer((int) count);
             //组织成员的客户有效个数
             QueryWrapper<OpSellerCustomerRelation> wrapper4 = new QueryWrapper<>();
             wrapper4.in("user_id", memberList.stream().map(PrivilageOrganizationalMember::getUserId).collect(Collectors.toList()));
             wrapper4.eq("type", 1);
-            List<OpSellerCustomerRelation> opRelations1 = opSellerCustomerRelationDOMapper.selectList(wrapper4);
+            List<OpSellerCustomerRelation> 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<Long> userIds) {
+        if(userIds.size() == 0){
+            return;
+        }
         //最初时间的总客户人数
         QueryWrapper<OpSellerCustomerRelation> wrapper2 = new QueryWrapper<>();
         wrapper2.in("user_id", userIds);
@@ -448,15 +451,15 @@ public class RetailCompanyService {
         //查询所有的店铺信息
         QueryWrapper<PoiStore> poiStoreQueryWrapper = new QueryWrapper<>();
         poiStoreQueryWrapper.in("id", shopIds);
-        List<PoiStore> list2 = poiStoreDOMapper.selectList(poiStoreQueryWrapper);
+        List<PoiStore> list2 = shopIds.size() == 0 ? new ArrayList<>() : poiStoreDOMapper.selectList(poiStoreQueryWrapper);
 
         Map<Long, PoiStore> map = list2.stream().collect(Collectors.toMap(PoiStore::getId, p -> p));
 
         //所有的导购客户个数
-        List<Map<String, Object>> map1 = opSellerCustomerRelationDOMapper.selectAllCustomerShop(shopIds);
+        List<Map<String, Object>> map1 = shopIds.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectAllCustomerShop(shopIds);
         Map<Long, Object> collect = map1 == null ? new HashMap<>() : map1.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("store_id").toString()), m1 -> m1.get("count")));
 
-        List<Map<String, Object>> map2 = opSellerCustomerRelationDOMapper.selectAllCustomerShop1(shopIds);
+        List<Map<String, Object>> map2 = shopIds.size() == 0 ? new ArrayList<>() : opSellerCustomerRelationDOMapper.selectAllCustomerShop1(shopIds);
         Map<Long, Object> collect1 = map2 == null ? new HashMap<>() : map2.stream().collect(Collectors.toMap(m -> Long.parseLong(m.get("store_id").toString()), m1 -> m1.get("count")));
         List<StoreOrganizationalVO> list1 = new ArrayList<>();