suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表列表接口

Browse Source
This commit is contained in:
shuo.wang
2025-05-14 14:20:27 +08:00
parent 3137d9d7f4
commit f09b89b5fe
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java
View File

@@ -52,7 +52,7 @@ public class BigRegionDAO {
return null; return null;
} }
Example example = new Example(BigRegionDO.class); Example example = new Example(BigRegionDO.class);
example.createCriteria().andIn("regionId", regionIdList); example.createCriteria().andIn("regionId", regionIdList).andEqualTo("joinMode",0);
return bigRegionMapper.selectByExample(example); return bigRegionMapper.selectByExample(example);
} }

2
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -504,7 +504,7 @@
#{storeType} #{storeType}
</foreach> </foreach>
</if> </if>
and b.actual_completion_time >= #{request.buildStartTime} and b.actual_completion_time &lt;= #{request.buildEndTime} and b.actual_complete_time >= #{request.buildStartTime} and b.actual_complete_time &lt;= #{request.buildEndTime}
</select> </select>
<update id="batchUpdate" parameterType="list"> <update id="batchUpdate" parameterType="list">

21
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
View File

@@ -60,7 +60,6 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
log.info("查询门店数据为空"); log.info("查询门店数据为空");
return null; return null;
} }
List<FranchiseReportResponse> responseList = new ArrayList<>();
List<Long> shopIds = shopFranchiseReportList.stream().map(FranchiseReportDTO::getShopId).collect(Collectors.toList()); List<Long> shopIds = shopFranchiseReportList.stream().map(FranchiseReportDTO::getShopId).collect(Collectors.toList());
Set<Long> regionSet = shopFranchiseReportList.stream().map(FranchiseReportDTO::getRegionId).collect(Collectors.toSet()); Set<Long> regionSet = shopFranchiseReportList.stream().map(FranchiseReportDTO::getRegionId).collect(Collectors.toSet());
//加盟费账单 //加盟费账单
@@ -74,6 +73,8 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId());
if (response == null) { if (response == null) {
response = new FranchiseReportResponse(); response = new FranchiseReportResponse();
response.setRegionId(shopFranchiseReportDTO.getRegionId());
response.setRegionName(bigRegionDOMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new BigRegionDO()).getRegionName());
response.setJoinGroupName(bigRegionDOMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new BigRegionDO()).getGroupName()); response.setJoinGroupName(bigRegionDOMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new BigRegionDO()).getGroupName());
} }
if (StoreTypeEnum.NO_SHOW_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())) { if (StoreTypeEnum.NO_SHOW_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())) {
@@ -100,7 +101,6 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response); responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response);
} }
FranchiseReportRequest yesterdayRequest = new FranchiseReportRequest(); FranchiseReportRequest yesterdayRequest = new FranchiseReportRequest();
yesterdayRequest.setJoinGroupName(request.getJoinGroupName());
yesterdayRequest.setRegionIds(request.getRegionIds()); yesterdayRequest.setRegionIds(request.getRegionIds());
yesterdayRequest.setStoreTypes(request.getStoreTypes()); yesterdayRequest.setStoreTypes(request.getStoreTypes());
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
@@ -114,6 +114,21 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
yesterdayRequest.setBuildStartTime(yesterdayStartTime); yesterdayRequest.setBuildStartTime(yesterdayStartTime);
yesterdayRequest.setBuildEndTime(yesterdayEndTime); yesterdayRequest.setBuildEndTime(yesterdayEndTime);
List<FranchiseReportDTO> yesterdayShopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(yesterdayRequest); List<FranchiseReportDTO> yesterdayShopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(yesterdayRequest);
return null; DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
if (CollectionUtils.isNotEmpty(yesterdayShopFranchiseReportList)) {
Map<Long, List<FranchiseReportDTO>> yesterdayMap = yesterdayShopFranchiseReportList.stream().collect( Collectors.groupingBy(FranchiseReportDTO::getRegionId));
for (Long regionId : responseByRegionIdMap.keySet()){
FranchiseReportResponse response = responseByRegionIdMap.get(regionId);
if (Objects.isNull(response)){
continue;
}
List<FranchiseReportDTO> yesterdayList = yesterdayMap.get(regionId);
response.setYesterdayDate(yesterdayStartDate.format(formatter1));
response.setYesterdayStoreNum(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size());
responseByRegionIdMap.put(regionId, response);
}
}
return new ArrayList<>(responseByRegionIdMap.values());
} }
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -218,7 +218,7 @@ public class SyncDataServiceImpl implements SyncDataService {
request.setShopProvince(pointInfo.getProvince()); request.setShopProvince(pointInfo.getProvince());
request.setShopCity(pointInfo.getCity()); request.setShopCity(pointInfo.getCity());
} }
log.info("/pushData 数据 ：{}",JSONObject.toJSONString(request));
return request; return request;
} }