|
@@ -48,7 +48,10 @@ public class MercMiniOrderController {
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
vo.setOrderTotalAmount(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum());
|
|
|
- vo.setOrderNum(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
|
|
|
+ int sumSalesCount = mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum();
|
|
|
+ int sumRiskCount = mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getRiskCount).sum();
|
|
|
+ int sumZeroCount = mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getZeroCount).sum();
|
|
|
+ vo.setOrderNum(sumSalesCount + sumRiskCount + sumZeroCount);
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|