czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

台桌统计导出数据处理tableId为null的问题

Browse Source
This commit is contained in:
GYJ
2024-10-31 11:20:00 +08:00
parent c717d0f2c2
commit 5ef762f670
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
View File

@@ -477,12 +477,14 @@ public class SummaryServiceImpl implements SummaryService {
shopTableSaleInfoDto.getShopId(), shopTableSaleInfoDto.getShopId(),
start, end); start, end);
Map<String, List<TbOrderSalesCountByTable>> ctMap = countByTables.stream() if (countByTables != null && !countByTables.isEmpty()) {
.collect(Collectors.groupingBy(TbOrderSalesCountByTable::getTableId)); Map<String, List<TbOrderSalesCountByTable>> ctMap = countByTables.stream()
.collect(Collectors.groupingBy(TbOrderSalesCountByTable::getTableId));
ctMap.forEach((k, v) -> { ctMap.forEach((k, v) -> {
countByTableMap.put(dateKey + "-" + k, v); countByTableMap.put(dateKey + "-" + k, v);
}); });
}
for (ShopTableSaleInfoVo infoVo : infoVos) { for (ShopTableSaleInfoVo infoVo : infoVos) {
tableCodeSet.add(infoVo.getTableCode()); tableCodeSet.add(infoVo.getTableCode());

7
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java
View File

@@ -61,4 +61,11 @@ public class TbOrderSalesCountByTable {
salesNum=salesNum-refNum; salesNum=salesNum-refNum;
salesAmount=salesAmount.subtract(refAmount); salesAmount=salesAmount.subtract(refAmount);
} }
public String getTableId() {
if (tableId == null) {
return "";
}
return tableId;
}
} }