|
|
@@ -54,7 +54,7 @@ public class StoreCashOutRecordServiceImpl extends ServiceImpl<StoreCashOutRecor
|
|
|
IPage<StoreCashOutRecord> storeCashOutRecordIPage = ListToPage.setPage(recordList, page, size);
|
|
|
StoreCashOutRecordVo vo = new StoreCashOutRecordVo();
|
|
|
vo.setCashOutRecordList( storeCashOutRecordIPage.getRecords());
|
|
|
- vo.setCashOutAllMoney(new BigDecimal(recordList.stream().mapToInt(StoreCashOutRecord::getMoney).sum()).divide(new BigDecimal(100), 2, RoundingMode.DOWN));
|
|
|
+ vo.setCashOutAllMoney(new BigDecimal(recordList.stream().filter(item -> "1".equals(item.getPaymentStatus().toString())).mapToInt(StoreCashOutRecord::getMoney).sum()).divide(new BigDecimal(100), 2, RoundingMode.DOWN));
|
|
|
vo.setCashOutNum(recordList.size());
|
|
|
return vo;
|
|
|
}
|