Commit 371bd01d authored by unset's avatar unset

会员统计信息修改

parent cb47c6f8
...@@ -16,4 +16,7 @@ public class MemberOrderStatisticsBo { ...@@ -16,4 +16,7 @@ public class MemberOrderStatisticsBo {
private Integer type; private Integer type;
private Integer orderNum; private Integer orderNum;
private BigDecimal totalAmount; private BigDecimal totalAmount;
private String orderNumName;
private String amountName;
} }
...@@ -434,15 +434,26 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz ...@@ -434,15 +434,26 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
total.setOrderNum(baseOrders.size()); total.setOrderNum(baseOrders.size());
total.setTotalAmount(new BigDecimal(baseOrders.stream().mapToDouble(n -> n.getOrderAmount()!=null ?n.getOrderAmount().doubleValue() total.setTotalAmount(new BigDecimal(baseOrders.stream().mapToDouble(n -> n.getOrderAmount()!=null ?n.getOrderAmount().doubleValue()
: 0.00).summaryStatistics().getSum()).setScale(2, BigDecimal.ROUND_HALF_UP)); : 0.00).summaryStatistics().getSum()).setScale(2, BigDecimal.ROUND_HALF_UP));
total.setAmountName("支付总额(元)");
total.setOrderNumName("订单总数(单)");
list.add(total); list.add(total);
List<BaseUserMemberLevel> levelList = userFeign.levels();
Map<Integer, List<BaseUserMemberLevel>> levelMap = levelList.stream().collect(Collectors.groupingBy(BaseUserMemberLevel::getLevel));
for (Map.Entry<Integer, List<MemberOrderBo>> entry : map.entrySet()) { for (Map.Entry<Integer, List<MemberOrderBo>> entry : map.entrySet()) {
MemberOrderStatisticsBo memberOrderStatisticsBo = new MemberOrderStatisticsBo(); MemberOrderStatisticsBo memberOrderStatisticsBo = new MemberOrderStatisticsBo();
memberOrderStatisticsBo.setType(entry.getKey()); memberOrderStatisticsBo.setType(entry.getKey());
List<MemberOrderBo> memberOrderBoList = entry.getValue(); List<MemberOrderBo> memberOrderBoList = entry.getValue();
if (memberOrderBoList != null) { if (memberOrderBoList != null) {
List<BaseUserMemberLevel> baseUserMemberLevelList = levelMap.get(memberOrderStatisticsBo.getType());
if (baseUserMemberLevelList != null && baseUserMemberLevelList.size() > 0) {
memberOrderStatisticsBo.setAmountName(baseUserMemberLevelList.get(0).getName() + "支付总额(元)");
memberOrderStatisticsBo.setOrderNumName(baseUserMemberLevelList.get(0).getName() + "订单");
}
memberOrderStatisticsBo.setOrderNum(memberOrderBoList.size()); memberOrderStatisticsBo.setOrderNum(memberOrderBoList.size());
memberOrderStatisticsBo.setTotalAmount(new BigDecimal(memberOrderBoList.stream().mapToDouble(n -> n.getOrderAmount()!=null ?n.getOrderAmount().doubleValue() memberOrderStatisticsBo.setTotalAmount(new BigDecimal(memberOrderBoList.stream().mapToDouble(n -> n.getOrderAmount()!=null ?n.getOrderAmount().doubleValue()
: 0.00).summaryStatistics().getSum()).setScale(2, BigDecimal.ROUND_HALF_UP)); : 0.00).summaryStatistics().getSum()).setScale(2, BigDecimal.ROUND_HALF_UP));
} else { } else {
memberOrderStatisticsBo.setOrderNum(0); memberOrderStatisticsBo.setOrderNum(0);
memberOrderStatisticsBo.setTotalAmount(BigDecimal.ZERO); memberOrderStatisticsBo.setTotalAmount(BigDecimal.ZERO);
......
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