Commit 389e6e31 authored by libin's avatar libin

Merge branch 'order_received_statistics' into dev

parents 8f95254c 0d61c47e
...@@ -108,6 +108,7 @@ public enum ReceivedStatisticsEnum { ...@@ -108,6 +108,7 @@ public enum ReceivedStatisticsEnum {
.weekOfYear(orderReceivedStatisticsBase.getWeekOfYear()) .weekOfYear(orderReceivedStatisticsBase.getWeekOfYear())
.year(orderReceivedStatisticsBase.getYear()) .year(orderReceivedStatisticsBase.getYear())
.orderNum(quantity) .orderNum(quantity)
.dateStr(orderReceivedStatisticsBase.getDateStr())
.orderAmount(amount) .orderAmount(amount)
.build(); .build();
} }
......
...@@ -23,6 +23,7 @@ public class OrderReceivedStatisticsVo { ...@@ -23,6 +23,7 @@ public class OrderReceivedStatisticsVo {
private String year; private String year;
@ApiModelProperty("日期-->日统计方式") @ApiModelProperty("日期-->日统计方式")
private Date date; private Date date;
private String dateStr;
@ApiModelProperty("第几周---->周统计方式") @ApiModelProperty("第几周---->周统计方式")
private String weekOfYear; private String weekOfYear;
@ApiModelProperty("月统计") @ApiModelProperty("月统计")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment