|
|
|
@ -281,6 +281,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 = listOfRetailCompany(userId, null,orgId);
|
|
|
|
|
|
|
|
|
|
List<RetailOrganizationalVO> list = new ArrayList<>();
|
|
|
|
@ -468,13 +469,13 @@ public class RetailCompanyService {
|
|
|
|
|
*/
|
|
|
|
|
public OrganizationVO generalizeOfStore(long userId,String startTime, String endTime, Long orgId, Long shopId, int pageNum, int pageSize) {
|
|
|
|
|
//根据零售公司查询门店
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
List<Long> shopIds = new ArrayList<>();
|
|
|
|
|
if(shopId != null){
|
|
|
|
|
shopIds.add(shopId);
|
|
|
|
|
}else {
|
|
|
|
|
shopIds = privilageDomainService.listUserDatePermission(userId);
|
|
|
|
|
}
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
List<CompanyStoreDO> list = retailCompanyMapper.selectShopIdByRetail(orgId, shopIds);
|
|
|
|
|
|
|
|
|
|
//查询所有的店铺信息
|
|
|
|
@ -551,13 +552,13 @@ public class RetailCompanyService {
|
|
|
|
|
*/
|
|
|
|
|
public OrganizationVO generalizeOfSeller(long userId,String startTime, String endTime, Long orgId, Long shopId, Long sellerId, int pageNum, int pageSize) {
|
|
|
|
|
//根据零售公司查询门店
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
List<Long> shopIds = new ArrayList<>();
|
|
|
|
|
if(shopId != null){
|
|
|
|
|
shopIds.add(shopId);
|
|
|
|
|
}else {
|
|
|
|
|
shopIds = privilageDomainService.listUserDatePermission(userId);
|
|
|
|
|
}
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
List<Long> sellerIds = retailCompanyMapper.selectSellerIdsByShop(orgId, shopIds, sellerId);
|
|
|
|
|
List<SellerOrganizationalVO> list = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|