删除多余 if - else

This commit is contained in:
gong
2025-12-08 17:03:31 +08:00
parent e53d275ba0
commit b2abaed3c8

View File

@@ -80,34 +80,32 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
public List<ShopProdStatistic> getArchiveTradeData(SaleSummaryCountParam param) { public List<ShopProdStatistic> getArchiveTradeData(SaleSummaryCountParam param) {
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
param.setProductName(CzgStrUtils.getStrOrNull(param.getProductName())); param.setProductName(CzgStrUtils.getStrOrNull(param.getProductName()));
List<ShopProdStatistic> resultList;
if ("today".equals(param.getRangeType())) { if ("today".equals(param.getRangeType())) {
resultList = getRealTimeDataByDay(param.getShopId(), currentDate, param.getProductName(), param.getCategoryId()); return getRealTimeDataByDay(param.getShopId(), currentDate, param.getProductName(), param.getCategoryId());
} else if ("yesterday".equals(param.getRangeType())) { }
resultList = getProdStatSingleDate(param.getShopId(), currentDate.minusDays(1),
if ("yesterday".equals(param.getRangeType())) {
return getProdStatSingleDate(param.getShopId(), currentDate.minusDays(1),
param.getProductName(), param.getCategoryId()); param.getProductName(), param.getCategoryId());
} else { }
if (param.getBeginDate().isAfter(currentDate)) { if (param.getBeginDate().isAfter(currentDate)) {
throw new CzgException("开始时间不能晚于当前时间"); throw new CzgException("开始时间不能晚于当前时间");
} }
if (param.getBeginDate().equals(param.getEndDate())) { if (param.getBeginDate().equals(param.getEndDate())) {
resultList = getProdStatSingleDate(param.getShopId(), param.getBeginDate(), param.getProductName(), return getProdStatSingleDate(param.getShopId(), param.getBeginDate(), param.getProductName(),
param.getCategoryId()); param.getCategoryId());
} else { }
if (param.getEndDate().isBefore(currentDate)) { if (param.getEndDate().isBefore(currentDate)) {
resultList = getProdStatDateRange(param.getShopId(), param.getBeginDate(), param.getEndDate(), return getProdStatDateRange(param.getShopId(), param.getBeginDate(), param.getEndDate(),
param.getProductName(), param.getCategoryId()); param.getProductName(), param.getCategoryId());
} else { }
List<ShopProdStatistic> realTimeDataByDay = getRealTimeDataByDay(param.getShopId(), currentDate, List<ShopProdStatistic> realTimeDataByDay = getRealTimeDataByDay(param.getShopId(), currentDate,
param.getProductName(), param.getCategoryId()); param.getProductName(), param.getCategoryId());
List<ShopProdStatistic> dateRange = getProdStatDateRange(param.getShopId(), param.getBeginDate(), List<ShopProdStatistic> dateRange = getProdStatDateRange(param.getShopId(), param.getBeginDate(),
param.getEndDate(), param.getProductName(), param.getCategoryId()); param.getEndDate(), param.getProductName(), param.getCategoryId());
resultList = mergeProdStatistic(realTimeDataByDay, dateRange); return mergeProdStatistic(realTimeDataByDay, dateRange);
}
}
}
return resultList;
} }