Commit 5b25fd1a authored by hanfeng's avatar hanfeng

Merge branch 'master-order-statistics' into dev

parents af858884 e9b827bd
...@@ -160,7 +160,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz ...@@ -160,7 +160,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
@ApiOperation(value = "会员统计") @ApiOperation(value = "会员统计")
public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException { public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
if (query.getEndTime()!=null) { if (query.getEndTime()!=null) {
query.setEndTime(query.getStartTime()+(24*60*60*1000)); query.setEndTime(query.getEndTime()+(24*60*60*1000));
} }
//获取会员等级信息 //获取会员等级信息
List<BaseUserMemberLevel> memberLevels = userFeign.levels(); List<BaseUserMemberLevel> memberLevels = userFeign.levels();
...@@ -173,7 +173,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz ...@@ -173,7 +173,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
@ApiOperation(value = "下载excel表") @ApiOperation(value = "下载excel表")
public void downloadExcel(@RequestBody OrderQuery query) throws Exception { public void downloadExcel(@RequestBody OrderQuery query) throws Exception {
if (query.getEndTime()!=null) { if (query.getEndTime()!=null) {
query.setEndTime(query.getStartTime()+(24*60*60*1000)); query.setEndTime(query.getEndTime()+(24*60*60*1000));
} }
// 通过工具类创建writer,默认创建xls格式 // 通过工具类创建writer,默认创建xls格式
ExcelWriter writer = ExcelUtil.getWriter(true); ExcelWriter writer = ExcelUtil.getWriter(true);
......
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