czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

当日总销售额不正确问题

Browse Source
This commit is contained in:
gong
2026-01-31 14:14:01 +08:00
parent 0d4b1ace60
commit c9e154299b
1 changed files with 52 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/TableSummaryServiceImpl.java
View File

@@ -15,9 +15,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -32,7 +30,6 @@ public class TableSummaryServiceImpl implements TableSummaryService {
@Resource @Resource
private ShopTableOrderStatisticMapper shopTableOrderStatisticMapper; private ShopTableOrderStatisticMapper shopTableOrderStatisticMapper;
@Override @Override
public void summaryExportList(TableSummaryParam param, HttpServletResponse response) { public void summaryExportList(TableSummaryParam param, HttpServletResponse response) {
if (param.getBeginDate() == null && param.getEndDate() == null) { if (param.getBeginDate() == null && param.getEndDate() == null) {
@@ -51,47 +48,41 @@ public class TableSummaryServiceImpl implements TableSummaryService {
param.setBeginDate(formattedStartDate + " 00:00:00"); param.setBeginDate(formattedStartDate + " 00:00:00");
param.setEndDate(formattedEndDate + " 23:59:59"); param.setEndDate(formattedEndDate + " 23:59:59");
} }
List<TableSummaryExportVo> list = shopTableOrderStatisticMapper.findSummaryExportList(param); List<TableSummaryExportVo> list = shopTableOrderStatisticMapper.findSummaryExportList(param);
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
ExcelExportUtil.exportToResponse(new ArrayList<>(), TableSummaryExportVo.class, "台桌统计", response); ExcelExportUtil.exportToResponse(new ArrayList<>(), TableSummaryExportVo.class, "台桌统计", response);
return; return;
} }
record TableSummary(String tableKey, BigDecimal totalSales, Map<Long, BigDecimal> productSales) {}
Map<String, TableSummary> summaryMap = list.stream() // === Step 1: 按日期计算 当日总销售额 ===
Map<String, BigDecimal> dailyTotalMap = list.stream()
.collect(Collectors.groupingBy(
TableSummaryExportVo::getCreateDate,
Collectors.reducing(BigDecimal.ZERO, TableSummaryExportVo::getAmount, BigDecimal::add)
));
// === Step 2: 按 台桌+日期 计算 每台桌当日销售额 ===
Map<String, BigDecimal> tableDailyTotalMap = list.stream()
.collect(Collectors.groupingBy( .collect(Collectors.groupingBy(
vo -> vo.getTableCode() + "_" + vo.getCreateDate(), vo -> vo.getTableCode() + "_" + vo.getCreateDate(),
Collectors.collectingAndThen( Collectors.reducing(BigDecimal.ZERO, TableSummaryExportVo::getAmount, BigDecimal::add)
Collectors.toList(),
vos -> {
String tableKey = vos.getFirst().getTableCode() + "_" + vos.getFirst().getCreateDate();
BigDecimal totalSales = vos.stream()
.map(TableSummaryExportVo::getAmount)
.reduce(BigDecimal.ZERO, BigDecimal::add);
Map<Long, BigDecimal> productSales = vos.stream()
.collect(Collectors.groupingBy(
TableSummaryExportVo::getProductId,
Collectors.reducing(
BigDecimal.ZERO,
TableSummaryExportVo::getAmount,
BigDecimal::add
)
)); ));
return new TableSummary(tableKey, totalSales, productSales);
}
)
));
list.forEach(vo -> { // === Step 3: 回填字段 ===
TableSummary summary = summaryMap.get(vo.getTableConcatDate()); for (TableSummaryExportVo vo : list) {
if (summary != null) { String dateKey = vo.getCreateDate();
vo.setTotalSalesAmount(summary.totalSales()); String tableDateKey = vo.getTableCode() + "_" + dateKey;
vo.setSalesAmount(summary.productSales().getOrDefault(vo.getProductId(), BigDecimal.ZERO));
}
});
// 设置“总销售额” = 该台桌当天总销售额
vo.setSalesAmount(tableDailyTotalMap.getOrDefault(tableDateKey, BigDecimal.ZERO));
// 设置“当日总销售额” = 当天所有台桌总和
vo.setTotalSalesAmount(dailyTotalMap.getOrDefault(dateKey, BigDecimal.ZERO));
}
// === Step 4: 导出 ===
List<SheetWriteHandler> strategies = calculateMergeCells(list); List<SheetWriteHandler> strategies = calculateMergeCells(list);
ExcelExportUtil.exportMultipleSheetsToResponse( ExcelExportUtil.exportMultipleSheetsToResponse(
List.of(new SheetData() List.of(new SheetData()
@@ -108,89 +99,52 @@ public class TableSummaryServiceImpl implements TableSummaryService {
*/ */
private List<SheetWriteHandler> calculateMergeCells(List<TableSummaryExportVo> list) { private List<SheetWriteHandler> calculateMergeCells(List<TableSummaryExportVo> list) {
List<SheetWriteHandler> mergeInfos = new ArrayList<>(); List<SheetWriteHandler> mergeInfos = new ArrayList<>();
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return mergeInfos; return mergeInfos;
} }
// 按createDate分组 // 按日期分组（用于合并“日期”和“当日总销售额”列）
Map<String, List<TableSummaryExportVo>> byCreateDate = list.stream() Map<String, List<TableSummaryExportVo>> byDate = list.stream()
.collect(Collectors.groupingBy(TableSummaryExportVo::getCreateDate)); .collect(Collectors.groupingBy(TableSummaryExportVo::getCreateDate));
List<String> keyList = byCreateDate.keySet().stream().sorted().toList(); int currentRow = 1; // Excel 数据从第1行开始（第0行为标题）
// Excel行号从1开始（假设第0行是标题） // 按日期排序
int startRow = 1; List<String> sortedDates = byDate.keySet().stream().sorted().toList();
for (String key : keyList) { for (String date : sortedDates) {
List<TableSummaryExportVo> dateGroup = byCreateDate.get(key); List<TableSummaryExportVo> dateGroup = byDate.get(date);
int dateGroupSize = dateGroup.size(); int dateSize = dateGroup.size();
// 合并createDate列（假设是第1列） // 合并“日期”列（第0列）和“当日总销售额”列（第9列）
if (dateGroupSize > 1) { if (dateSize > 1) {
mergeInfos.add(ExcelExportUtil.createMergeStrategy(startRow, startRow + dateGroupSize - 1, 0, 0)); mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + dateSize - 1, 0, 0));
mergeInfos.add(ExcelExportUtil.createMergeStrategy(startRow, startRow + dateGroupSize - 1, 9, 9)); mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + dateSize - 1, 9, 9));
} }
// 在销售额组内按tableName分组 // 在日期组内，按台桌分组（用于合并“台桌”和“总销售额”列）
Map<String, List<TableSummaryExportVo>> byTableName = dateGroup.stream() Map<String, List<TableSummaryExportVo>> byTable = dateGroup.stream()
.collect(Collectors.groupingBy(TableSummaryExportVo::getTableName)); .collect(Collectors.groupingBy(TableSummaryExportVo::getTableName));
List<String> nameKeyList = byTableName.keySet().stream().sorted().toList(); int tableStartRow = currentRow;
List<String> sortedTables = byTable.keySet().stream().sorted().toList();
int currentRow = startRow; for (String table : sortedTables) {
for (String nameKey : nameKeyList) { List<TableSummaryExportVo> tableGroup = byTable.get(table);
int nameGroupSize = byTableName.get(nameKey).size(); int tableSize = tableGroup.size();
// 合并tableName列（假设是第4列，根据实际Excel列调整） // 合并“台桌”列（第1列）和“总销售额”列（第8列）
if (nameGroupSize > 1) { if (tableSize > 1) {
mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + nameGroupSize - 1, 1, 1)); mergeInfos.add(ExcelExportUtil.createMergeStrategy(tableStartRow, tableStartRow + tableSize - 1, 1, 1));
mergeInfos.add(ExcelExportUtil.createMergeStrategy(tableStartRow, tableStartRow + tableSize - 1, 8, 8));
} }
// 移动到下一组 tableStartRow += tableSize;
currentRow += nameGroupSize;
} }
// 在日期组内按totalSalesAmount分组（同台桌同日期） currentRow += dateSize;
Map<BigDecimal, List<TableSummaryExportVo>> byTotalSales = dateGroup.stream()
.collect(Collectors.groupingBy(TableSummaryExportVo::getTotalSalesAmount));
List<BigDecimal> salesKeyList = byTotalSales.keySet().stream().sorted().toList();
int nameRow = startRow;
for (BigDecimal saleKey : salesKeyList) {
List<TableSummaryExportVo> salesGroup = byTotalSales.get(saleKey);
int salesGroupSize = salesGroup.size();
// 合并totalSalesAmount列（假设是第8列，根据实际Excel列调整）
if (salesGroupSize > 1) {
mergeInfos.add(ExcelExportUtil.createMergeStrategy(nameRow, nameRow + salesGroupSize - 1, 9, 9));
}
// // 在销售额组内按tableName分组
// Map<String, List<TableSummaryExportVo>> byTableName = salesGroup.stream()
// .collect(Collectors.groupingBy(TableSummaryExportVo::getTableName));
//
// List<String> nameKeyList = byTableName.keySet().stream().sorted().toList();
//
// for (List<TableSummaryExportVo> nameGroup : byTableName.values()) {
// int nameGroupSize = nameGroup.size();
//
// // 合并tableName列（假设是第4列，根据实际Excel列调整）
// if (nameGroupSize > 1) {
// mergeInfos.add(ExcelExportUtil.createMergeStrategy(currentRow, currentRow + nameGroupSize - 1, 1, 1));
// }
//
// // 移动到下一组
// currentRow += nameGroupSize;
// }
}
startRow += dateGroupSize;
} }
return mergeInfos; return mergeInfos;
} }
} }