|
@@ -3003,14 +3003,14 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
@Override
|
|
@Override
|
|
|
public Map<Long, Integer> countFinishByShopIdWithLast30Days() {
|
|
public Map<Long, Integer> countFinishByShopIdWithLast30Days() {
|
|
|
// 统计近近30天每个店铺的已完成订单数量
|
|
// 统计近近30天每个店铺的已完成订单数量
|
|
|
- List<Map<Long, Integer>> shopSalesList = baseMapper.countFinishByShopIdWithLast30Days();
|
|
|
|
|
|
|
+ List<Map<String, Object>> shopSalesList = baseMapper.countFinishByShopIdWithLast30Days();
|
|
|
// 转换为ShopId -> OrderCount的Map返回
|
|
// 转换为ShopId -> OrderCount的Map返回
|
|
|
return shopSalesList.stream()
|
|
return shopSalesList.stream()
|
|
|
.filter(map -> map.containsKey("shop_id") && map.containsKey("order_count"))
|
|
.filter(map -> map.containsKey("shop_id") && map.containsKey("order_count"))
|
|
|
.filter(map -> map.get("shop_id") != null && map.get("order_count") != null)
|
|
.filter(map -> map.get("shop_id") != null && map.get("order_count") != null)
|
|
|
.collect(Collectors.toMap(
|
|
.collect(Collectors.toMap(
|
|
|
- map -> Long.parseLong(map.get("shop_id").toString()),
|
|
|
|
|
- map -> Integer.parseInt(map.get("order_count").toString())
|
|
|
|
|
|
|
+ map -> Long.valueOf(map.get("shop_id").toString()),
|
|
|
|
|
+ map -> Integer.valueOf(map.get("order_count").toString())
|
|
|
));
|
|
));
|
|
|
}
|
|
}
|
|
|
|
|
|