feat:统计接口增加订单测试数据
This commit is contained in:
@@ -69,4 +69,22 @@ public class DashboardController extends BaseController {
|
||||
return success(dashboardService.salesAmountStatisticsList(param));
|
||||
}
|
||||
|
||||
@OperationLog
|
||||
@ApiOperation("所有板块信息集合趋势图")
|
||||
@GetMapping("/statistics/chart")
|
||||
public ApiResult<Dashboard> statisticsChart(DashBoardParam param) {
|
||||
|
||||
if (param.getCreateTimeStart() == null){//时间不传递,默认开始时间为最近一周
|
||||
param.setCreateTimeStart(DateUtil.formatDate(DateUtil.lastWeek()));
|
||||
}
|
||||
if (param.getCreateTimeEnd()==null){//结束时间为,今天
|
||||
param.setCreateTimeEnd(DateUtil.today()+" 59:59:59");
|
||||
}
|
||||
|
||||
Dashboard dashboard = new Dashboard();
|
||||
dashboard.setSalesAmountStatisticsList(dashboardService.salesAmountStatisticsList(param));
|
||||
dashboard.setOrderStatisticsList(dashboardService.orderStatisticsList(param));
|
||||
return success(dashboard);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@@ -25,6 +26,18 @@ public class Dashboard {
|
||||
@ApiModelProperty(value = "设备统计")
|
||||
private EquipmentStatistics equipmentStatistics;//当日新增的设备,总设备
|
||||
|
||||
@ApiModelProperty(value = "销售统计集合")
|
||||
private List<SalesAmountStatistics> salesAmountStatisticsList;
|
||||
|
||||
@ApiModelProperty(value = "订单统计集合")
|
||||
private List<OrderStatistics> orderStatisticsList;
|
||||
|
||||
@ApiModelProperty(value = "用户统计集合")
|
||||
private List<UserStatistics> userStatisticsList;
|
||||
|
||||
@ApiModelProperty(value = "设备统计集合")
|
||||
private List<EquipmentStatistics> equipmentStatisticsList;
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "BaseStatistics", description = "基础统计")
|
||||
public static class BaseStatistics{
|
||||
|
||||
@@ -52,8 +52,16 @@ public interface DashboardService extends IService<Dashboard> {
|
||||
* 销售额统计趋势图
|
||||
*
|
||||
* @param param 查询参数
|
||||
* @return SalesAmountStatistics
|
||||
* @return List<Dashboard.SalesAmountStatistics>
|
||||
*/
|
||||
List<Dashboard.SalesAmountStatistics> salesAmountStatisticsList(DashBoardParam param);
|
||||
|
||||
|
||||
/**
|
||||
* 订单统计趋势图
|
||||
*
|
||||
* @param param 查询参数
|
||||
* @return List<Dashboard.OrderStatistics>
|
||||
*/
|
||||
List<Dashboard.OrderStatistics> orderStatisticsList(DashBoardParam param);
|
||||
}
|
||||
|
||||
@@ -186,4 +186,25 @@ public class DashboardServiceImpl extends ServiceImpl<DashboardMapper, Dashboard
|
||||
return salesAmountStatisticsList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Dashboard.OrderStatistics> orderStatisticsList(DashBoardParam param) {
|
||||
|
||||
//TODO 测试数据
|
||||
List<Dashboard.OrderStatistics> orderStatisticsList = new ArrayList<>();
|
||||
List<Date> dateList = new ArrayList<>();
|
||||
dateList.add(DateUtil.parse("2024-08-15"));
|
||||
dateList.add(DateUtil.parse("2024-08-16"));
|
||||
dateList.add(DateUtil.parse("2024-08-17"));
|
||||
dateList.add(DateUtil.parse("2024-08-18"));
|
||||
dateList.forEach(date -> {
|
||||
Dashboard.OrderStatistics orderStatistics=new Dashboard.OrderStatistics();
|
||||
orderStatistics.setDailyNewOrders(10);
|
||||
orderStatistics.setStartStatisticsDate(date);
|
||||
orderStatistics.setEndStatisticsDate(date);
|
||||
orderStatisticsList.add(orderStatistics);
|
||||
});
|
||||
|
||||
return orderStatisticsList;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user