Commit fd84a5e9 authored by hanfeng's avatar hanfeng

修改订单统计

parent 91f4dd4b
...@@ -64,6 +64,6 @@ public class OrderStatistics { ...@@ -64,6 +64,6 @@ public class OrderStatistics {
/** /**
* 历史实际消费总额 * 历史实际消费总额
*/ */
@ApiModelProperty(value = "实际消费总额") @ApiModelProperty(value = "历史实际消费总额")
private BigDecimal totalExpenditure; private BigDecimal totalExpenditure;
} }
...@@ -56,7 +56,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat ...@@ -56,7 +56,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
OrderStatistics member = membersBiz.findAll(companyId); OrderStatistics member = membersBiz.findAll(companyId);
if (vehicle != null) { if (vehicle != null) {
HomePageOrderData data = new HomePageOrderData() {{ HomePageOrderData data = new HomePageOrderData() {{
setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv())); setTotalOrders(member.getTotalGmv());
}}; }};
orderStatistics.add(data); orderStatistics.add(data);
......
...@@ -108,7 +108,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz ...@@ -108,7 +108,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
if (TYPE_MEMBER.equals(type)) { if (TYPE_MEMBER.equals(type)) {
OrderStatistics member = membersBiz.findAll(companyId); OrderStatistics member = membersBiz.findAll(companyId);
return ObjectRestResponse.succ(new HomePageOrderData(){{ return ObjectRestResponse.succ(new HomePageOrderData(){{
setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv())); setTotalOrders(member.getTotalGmv());
}}); }});
} }
......
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