diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index 56a091d0..fc2e2f4c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -53,6 +53,8 @@ public class SummaryServiceImpl implements SummaryService { } //用户数 Tuple count = tbShopUserRepository.searchByCount(shopId.toString()); + + summaryVO.setTotalUser(count.get(0, Long.class)); //支付笔数柱形图 List objects = shopUserDutyRepository.sumByDateOrderNum(shopId, DateUtil.getDate30DaysAgo(), DateUtil.getDayEnd()); @@ -90,6 +92,7 @@ public class SummaryServiceImpl implements SummaryService { // 将SumDateVO对象添加到列表中 countDateLists.add(countDateVO); } + countDateLists.sort((a,b)->a.getTradeDay().compareTo(b.getTradeDay())); summaryVO.setCountDateList(countDateLists); //访问量 Tuple tuple = tbTokenRepository.countByAccountId(shopId); @@ -126,6 +129,7 @@ public class SummaryServiceImpl implements SummaryService { // 将SumDateVO对象添加到列表中 countVisitsLists.add(countDateVO); } + countVisitsLists.sort((a,b)->a.getTradeDay().compareTo(b.getTradeDay())); summaryVO.setVisitsCountList(countVisitsLists); return summaryVO; } @@ -275,7 +279,7 @@ public class SummaryServiceImpl implements SummaryService { Tuple tuple1 = tbShopUserRepository.searchByCountToday(shopId.toString(), DateUtil.getTodayStartTimestamp(), DateUtil.getTodayEndTimestamp()); map.put("userToday", tuple1.get(0, Long.class)); Tuple tupleToday = tbTokenRepository.countByAccountId(shopId, DateUtil.getDayBegin(), DateUtil.getDayEnd()); - map.put("totalVisitsToday",tupleToday); + map.put("totalVisitsToday",tupleToday == null?0:tupleToday.get(0,Long.class)); return map; } @Override diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SummaryVO.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SummaryVO.java index dc83f315..091f944c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/SummaryVO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/SummaryVO.java @@ -31,7 +31,7 @@ public class SummaryVO { */ private Long totalUser =0L; /** - * 销售额柱形图 + * 支付笔数柱形图 */ private List countDateList; /** @@ -43,5 +43,9 @@ public class SummaryVO { */ public List visitsCountList; + /** + * 用户数柱状图 + */ + public List countShopUserList; }