|
@@ -3608,7 +3608,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
List<TopOldOrderVo> vos = baseMapper.queryListAll();
|
|
|
// BigDecimal price = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderPrice())).map(TopOldOrderVo::getOrderPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
// BigDecimal received = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderReceived())).map(TopOldOrderVo::getOrderReceived).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
- BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
+ BigDecimal uncollected = vos.stream().filter(x -> ObjectUtils.isNotNull(x.getOrderUncollected())&&x.getCheckStatus()==1).map(TopOldOrderVo::getOrderUncollected).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
/* map.put("orderPriceTotal", price);
|
|
|
map.put("orderReceivedTotal", received);*/
|
|
|
map.put("orderUncollectedTotal", uncollected); //未收账款
|