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

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-09-29 10:04:28 +08:00
parent 29d09abd5f 08f01e04ea
commit 66c28248b7
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,22 +234,16 @@ public class SummaryServiceImpl implements SummaryService {
List<Object[]> objects = tbOrderInfoRepository.queryTbOrderPaySumByDay(shopId.toString(), startTime, endTime);
//根据时间的销量
List<SumDateVO> sumDateVOList = new ArrayList<>();
Map<String, SumDateVO> dataMap = new HashMap<>();
for (Object[] o : objects) {
SumDateVO sumDateVO = new SumDateVO();
sumDateVO.setAmount((BigDecimal) o[0]);
sumDateVO.setOrderAmount((BigDecimal) o[0]);
sumDateVO.setTradeDay((String) o[1]);
sumDateVO.setSaveAmount((BigDecimal) o[2]);
sumDateVOList.add(sumDateVO);
}
//填充日期
Map<String, SumDateVO> dataMap = new HashMap<>();
for (SumDateVO entry : sumDateVOList) {
String tradeDay = entry.getTradeDay();
BigDecimal amount = entry.getAmount();
BigDecimal saveAmount = entry.getSaveAmount();
dataMap.put(tradeDay, new SumDateVO(tradeDay, amount, saveAmount));
sumDateVO.setDiscountAmount((BigDecimal) o[2]);
sumDateVO.setActualAmount(sumDateVO.getOrderAmount().subtract(sumDateVO.getDiscountAmount()));
dataMap.put(sumDateVO.getTradeDay(), sumDateVO);
}
// 获取今天的日期
LocalDate today = LocalDate.now();
// 定义日期格式
@@ -265,12 +259,12 @@ public class SummaryServiceImpl implements SummaryService {
sumDateVO = dataMap.get(tradeDayString);
} else {
// 如果不存在，则创建新的SumDateVO对象，amount设为0
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO, BigDecimal.ZERO);
sumDateVO = new SumDateVO(tradeDayString, BigDecimal.ZERO,BigDecimal.ZERO, BigDecimal.ZERO);
}
// 将SumDateVO对象添加到列表中
sumDateList.add(sumDateVO);
}
sumDateList.sort((a, b) -> a.getTradeDay().compareTo(b.getTradeDay()));
sumDateList.sort(Comparator.comparing(SumDateVO::getTradeDay));
map.put("total", sumDateList);
return map;
}