diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java index aa66093cf..6acbb0a2f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java @@ -52,7 +52,7 @@ public class BigRegionDAO { return null; } Example example = new Example(BigRegionDO.class); - example.createCriteria().andIn("regionId", regionIdList); + example.createCriteria().andIn("regionId", regionIdList).andEqualTo("joinMode",0); return bigRegionMapper.selectByExample(example); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 5491d7249..cc651b29d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -504,7 +504,7 @@ #{storeType} - and b.actual_completion_time >= #{request.buildStartTime} and b.actual_completion_time <= #{request.buildEndTime} + and b.actual_complete_time >= #{request.buildStartTime} and b.actual_complete_time <= #{request.buildEndTime} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index 8932be004..c35e3221e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -60,7 +60,6 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { log.info("查询门店数据为空"); return null; } - List responseList = new ArrayList<>(); List shopIds = shopFranchiseReportList.stream().map(FranchiseReportDTO::getShopId).collect(Collectors.toList()); Set regionSet = shopFranchiseReportList.stream().map(FranchiseReportDTO::getRegionId).collect(Collectors.toSet()); //加盟费账单 @@ -74,6 +73,8 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); if (response == null) { 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()); } if (StoreTypeEnum.NO_SHOW_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())) { @@ -100,7 +101,6 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response); } FranchiseReportRequest yesterdayRequest = new FranchiseReportRequest(); - yesterdayRequest.setJoinGroupName(request.getJoinGroupName()); yesterdayRequest.setRegionIds(request.getRegionIds()); yesterdayRequest.setStoreTypes(request.getStoreTypes()); LocalDate now = LocalDate.now(); @@ -114,6 +114,21 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { yesterdayRequest.setBuildStartTime(yesterdayStartTime); yesterdayRequest.setBuildEndTime(yesterdayEndTime); List yesterdayShopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(yesterdayRequest); - return null; + DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + if (CollectionUtils.isNotEmpty(yesterdayShopFranchiseReportList)) { + Map> yesterdayMap = yesterdayShopFranchiseReportList.stream().collect( Collectors.groupingBy(FranchiseReportDTO::getRegionId)); + for (Long regionId : responseByRegionIdMap.keySet()){ + FranchiseReportResponse response = responseByRegionIdMap.get(regionId); + if (Objects.isNull(response)){ + continue; + } + List 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()); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 26ccbb1af..c8a0214a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -218,7 +218,7 @@ public class SyncDataServiceImpl implements SyncDataService { request.setShopProvince(pointInfo.getProvince()); request.setShopCity(pointInfo.getCity()); } - + log.info("/pushData 数据 :{}",JSONObject.toJSONString(request)); return request; }