Commit e5afb338 authored by hanfeng's avatar hanfeng

Merge branch 'master-order-statistics' into dev

parents 2c617d42 50a29865
...@@ -213,7 +213,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat ...@@ -213,7 +213,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
if (CollectionUtils.isEmpty(membersOrderDto.getMembers())) { if (CollectionUtils.isEmpty(membersOrderDto.getMembers())) {
continue; continue;
} }
HashMap<Object, Object> map = Maps.newHashMap(); HashMap<Object, Object> map = Maps.newLinkedHashMap();
map.put("时间", membersOrderDto.getTimeSlot()); map.put("时间", membersOrderDto.getTimeSlot());
for (BaseUserMemberLevel memberLevel : memberLevels) { for (BaseUserMemberLevel memberLevel : memberLevels) {
setMap(membersOrderDto, map, memberLevel); setMap(membersOrderDto, map, memberLevel);
...@@ -235,7 +235,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat ...@@ -235,7 +235,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
number = collect.get(0).getNumber(); number = collect.get(0).getNumber();
amount = collect.get(0).getAmount(); amount = collect.get(0).getAmount();
} }
map.put(memberLevel.getName() + "购买量", 0); map.put(memberLevel.getName() + "购买量", number);
map.put("支付金额(" + memberLevel.getName() + ")", 0); map.put("支付金额(" + memberLevel.getName() + ")",amount);
} }
} }
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