From 11de076ba2682c378fabe9703d3b94130aaf8bb0 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 14 May 2025 10:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/FranchiseReportResponse.java | 2 +- .../impl/FranchiseReportServiceImpl.java | 96 +++++++++++-------- 2 files changed, 55 insertions(+), 43 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java index 35cc6bc71..1ca3b0361 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java @@ -21,7 +21,7 @@ public class FranchiseReportResponse { private String regionName; @ApiModelProperty(value = "门店数") - private Integer storeNum; + private Integer storeNum = 0; @ApiModelProperty(value = "鸡排普通店") private Integer normalStoreNum = 0; 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 32e866c53..cc8daab41 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 @@ -22,6 +22,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -43,48 +44,59 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { @Override public List getFranchiseReport(FranchiseReportRequest request) { - if (StringUtils.isBlank(request.getBuildStartTime()) || StringUtils.isBlank(request.getBuildEndTime())) { - throw new ServiceException(ErrorCodeEnum.TIME_NULL_FALSE); - } - //集团查大区 - List regionIdByGroupName = bigRegionDAO.getRegionIdByGroupName(request.getJoinGroupName()); - if (CollectionUtils.isNotEmpty(regionIdByGroupName)) { - request.getRegionIds().addAll(regionIdByGroupName); - } - List shopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(request); - if (CollectionUtils.isEmpty(shopFranchiseReportList)) { - 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()); - Map> shopByRegionMap = shopFranchiseReportList.stream().collect(Collectors.groupingBy(FranchiseReportDTO::getRegionId)); - //加盟费账单 - List franchiseFeeList = franchiseFeeMapper.getFranchiseFeeByShopIds(shopIds); - Map franchiseFeeMap = franchiseFeeList.stream().collect(Collectors.toMap(FranchiseFeeDO::getShopId, franchiseFeeDO -> franchiseFeeDO)); - List bigRegionDOList = bigRegionDAO.getByRegionIdList(new ArrayList<>(regionSet)); - Map bigRegionDOMap = bigRegionDOList.stream().collect(Collectors.toMap(BigRegionDO::getRegionId, bigRegionDO -> bigRegionDO)); - Map responseByRegionIdMap = new HashMap<>(); - - for (FranchiseReportDTO shopFranchiseReportDTO : shopFranchiseReportList) { - FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); - if (response == null){ - response = new FranchiseReportResponse(); - } - if (StoreTypeEnum.NO_SHOW_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ - response.setNoShowStoreNum(response.getNoShowStoreNum() + 1); - }else if (StoreTypeEnum.ORDINARY_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ - response.setNormalStoreNum(response.getNormalStoreNum() + 1); - }else if (StoreTypeEnum.RESTAURANT_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ - response.setRestaurantStoreNum(response.getRestaurantStoreNum() + 1); - } - FranchiseFeeDO franchiseFeeDO = franchiseFeeMap.get(shopFranchiseReportDTO.getShopId()); - if (franchiseFeeDO != null){ - // response.setFranchiseFeeTotal(response.getFranchiseFeeTotal().add(franchiseFeeDO.getYearFranchiseFee())); - } - } - +// if (StringUtils.isBlank(request.getBuildStartTime()) || StringUtils.isBlank(request.getBuildEndTime())) { +// throw new ServiceException(ErrorCodeEnum.TIME_NULL_FALSE); +// } +// //集团查大区 +// List regionIdByGroupName = bigRegionDAO.getRegionIdByGroupName(request.getJoinGroupName()); +// if (CollectionUtils.isNotEmpty(regionIdByGroupName)) { +// request.getRegionIds().addAll(regionIdByGroupName); +// } +// List shopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(request); +// if (CollectionUtils.isEmpty(shopFranchiseReportList)) { +// 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()); +// Map> shopByRegionMap = shopFranchiseReportList.stream().collect(Collectors.groupingBy(FranchiseReportDTO::getRegionId)); +// //加盟费账单 +// List franchiseFeeList = franchiseFeeMapper.getFranchiseFeeByShopIds(shopIds); +// Map franchiseFeeMap = franchiseFeeList.stream().collect(Collectors.toMap(FranchiseFeeDO::getShopId, franchiseFeeDO -> franchiseFeeDO)); +// List bigRegionDOList = bigRegionDAO.getByRegionIdList(new ArrayList<>(regionSet)); +// Map bigRegionDOMap = bigRegionDOList.stream().collect(Collectors.toMap(BigRegionDO::getRegionId, bigRegionDO -> bigRegionDO)); +// Map responseByRegionIdMap = new HashMap<>(); +// +// for (FranchiseReportDTO shopFranchiseReportDTO : shopFranchiseReportList) { +// FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); +// if (response == null){ +// response = new FranchiseReportResponse(); +// } +// if (StoreTypeEnum.NO_SHOW_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ +// response.setNoShowStoreNum(response.getNoShowStoreNum() + 1); +// }else if (StoreTypeEnum.ORDINARY_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ +// response.setNormalStoreNum(response.getNormalStoreNum() + 1); +// }else if (StoreTypeEnum.RESTAURANT_STORE.getCode().equals(shopFranchiseReportDTO.getStoreType())){ +// response.setRestaurantStoreNum(response.getRestaurantStoreNum() + 1); +// } +// response.setStoreNum(response.getStoreNum() + 1); +// FranchiseFeeDO franchiseFeeDO = franchiseFeeMap.get(shopFranchiseReportDTO.getShopId()); +// if (franchiseFeeDO != null){ +// response.setFranchiseFeeTotal(response.getFranchiseFeeTotal().add(new BigDecimal(franchiseFeeDO.getYearFranchiseFee()))); +// response.setLoanMarginTotal(response.getLoanMarginTotal().add(new BigDecimal(franchiseFeeDO.getLoanMargin()))); +// response.setFirstYearManagementFeeTotal(response.getFirstYearManagementFeeTotal().add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()))); +// response.setFirstYearBrandingFeeTotal(response.getFirstYearBrandingFeeTotal().add(new BigDecimal(franchiseFeeDO.getFirstYearFee()))); +// response.setPerformanceBondTotal(response.getPerformanceBondTotal().add(new BigDecimal(franchiseFeeDO.getPerformanceBond()))); +// response.setManagementBrandingDesignFeeTotal(response.getManagementBrandingDesignFeeTotal() +// .add(new BigDecimal(franchiseFeeDO.getYearFranchiseFee())) +// .add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee())) +// .add(new BigDecimal(franchiseFeeDO.getFirstYearFee())) +// .add(new BigDecimal(franchiseFeeDO.getPerformanceBond()))); +// } +// responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response); +// } +// return null; } }