推广管理零售公司

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

@@ -220,6 +220,40 @@ public class RetailCompanyService {
         }
     }
 
+    /**
+     * 查询所有的零售公司信息
+     */
+    public List<PrivilageOrganizational> listOfRetailCompanyPage(long userId, Long bigRegionId, Long orgId,int pageNum,int pageSize) {
+        if (bigRegionId == null || bigRegionId == 0L) {
+            bigRegionId = null;
+        }
+        QueryWrapper<PrivilageOrganizationalMember> wrapper1 = new QueryWrapper<>();
+        wrapper1.eq("user_id", userId);
+        List<PrivilageOrganizationalMember> pm = organizationalMemberMapper.selectList(wrapper1);
+        QueryWrapper<PrivilageOrganizational> wrapper = new QueryWrapper<>();
+        if (check(userId)) {
+            wrapper.eq("type", 2).eq("level", 2).eq("status", 1);
+            if (orgId != null) {
+                wrapper.eq("id",orgId);
+            }
+            PageHelper.startPage(pageNum,pageSize);
+            return retailCompanyMapper.selectList(wrapper);
+        }
+        if (pm.isEmpty()) {
+            return new ArrayList<>();
+        } else {
+            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);
+            }
+            if (orgId != null) {
+                wrapper.eq("id",orgId);
+            }
+            PageHelper.startPage(pageNum,pageSize);
+            return retailCompanyMapper.selectList(wrapper);
+        }
+    }
+
     /**
      * 查询零售公司下的店铺
      *
@@ -281,8 +315,7 @@ public class RetailCompanyService {
      * @return 零售公司的推广数据
      */
     public OrganizationVO generalizeOfRetail(Long userId,String startTime, String endTime, Long orgId, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum,pageSize);
+        List<PrivilageOrganizational> listOfOrg = listOfRetailCompanyPage(userId, null,orgId,pageNum,pageSize);
-        List<PrivilageOrganizational> listOfOrg = listOfRetailCompany(userId, null,orgId);
 
         List<RetailOrganizationalVO> list = new ArrayList<>();
         listOfOrg.parallelStream().forEach(org -> {

src/main/resources/mapper/PoiStoreDOMapper.xml

@@ -30,6 +30,7 @@
         and t4.type = 3
         and t1.store_id = t4.entity_id
         and t1.user_id = #{sellerId}
+        limit 1
     </select>
     <select id="selectShopByCompany" resultType="com.kiisoo.ic.store.entity.PoiStore">
         select t3.id,t3.name