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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
SongZhang
2024-09-29 09:55:31 +08:00
parent 2186cd5a04 3c5c0f7f47
commit c2ff66d937
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,6 +239,7 @@ public class SummaryServiceImpl implements SummaryService {
SumDateVO sumDateVO = new SumDateVO();
sumDateVO.setAmount((BigDecimal) o[0]);
sumDateVO.setTradeDay((String) o[1]);
sumDateVO.setSaveAmount((BigDecimal) o[2]);
sumDateVOList.add(sumDateVO);
}
//填充日期
@@ -246,7 +247,8 @@ public class SummaryServiceImpl implements SummaryService {
for (SumDateVO entry : sumDateVOList) {
String tradeDay = entry.getTradeDay();
BigDecimal amount = entry.getAmount();
dataMap.put(tradeDay, new SumDateVO(tradeDay, amount));
BigDecimal saveAmount = entry.getSaveAmount();
dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount));
}
// 获取今天的日期
LocalDate today = LocalDate.now();
@@ -263,7 +265,7 @@ public class SummaryServiceImpl implements SummaryService {
sumDateVO = dataMap.get(tradeDayString);
} else {
// 如果不存在，则创建新的SumDateVO对象，amount设为0
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO);
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO);
}
// 将SumDateVO对象添加到列表中
sumDateList.add(sumDateVO);