|
|
|
@@ -664,30 +664,30 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
List<WxBillAllVo> list = wxBillAllMapper.list(wxBillAll); |
|
|
|
if (!list.isEmpty()) { |
|
|
|
//租金总额 |
|
|
|
Long rentSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT.getCode())) |
|
|
|
Long rentSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//物业总额 |
|
|
|
Long propertySum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.PROPERTY.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//押金总额 |
|
|
|
Long depositSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT_DEPOSIT.getCode()) || |
|
|
|
Long depositSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT_DEPOSIT.getCode()) || |
|
|
|
b.getBillTypeValue().equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode()) || b.getBillTypeValue().equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//水费 |
|
|
|
Long waterSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.WATER.getCode())) |
|
|
|
Long waterSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.WATER.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//电费 |
|
|
|
Long powerSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.POWER.getCode())) |
|
|
|
Long powerSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.POWER.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//空调费 |
|
|
|
Long airConditioningSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.AIR_CONDITIONING.getCode())) |
|
|
|
Long airConditioningSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.AIR_CONDITIONING.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//其他费用 |
|
|
|
Long otherSum = list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.ROUTINE.getCode())) |
|
|
|
Long otherSum = list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.ROUTINE.getCode())) |
|
|
|
.collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe())); |
|
|
|
//押金明细 |
|
|
|
StringBuffer depositDetail = new StringBuffer(); |
|
|
|
list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT_DEPOSIT.getCode()) || |
|
|
|
list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.RENT_DEPOSIT.getCode()) || |
|
|
|
b.getBillTypeValue().equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode()) || b.getBillTypeValue().equals(EnumBillTypeParam.ATHER_DEPOSIT.getCode())) |
|
|
|
.forEach(b -> { |
|
|
|
BigDecimal owe = new BigDecimal(status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); |
|
|
|
@@ -696,7 +696,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
|
|
|
|
//其他费用明细 |
|
|
|
StringBuffer otherDetail = new StringBuffer(); |
|
|
|
list.parallelStream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.ROUTINE.getCode())) |
|
|
|
list.stream().filter(b -> b.getBillTypeValue().equals(EnumBillTypeParam.ROUTINE.getCode())) |
|
|
|
.forEach(b -> { |
|
|
|
BigDecimal owe = new BigDecimal(status == null && filterHasPay == null ? b.getReceivePay() : b.getOwe()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN); |
|
|
|
otherDetail.append(b.getName()).append(":[").append(owe.toPlainString()).append("] "); |
|
|
|
@@ -731,7 +731,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
List<WxMerchantVo> listCVo = wxMerchantMapper.findListCVo(wxMerchantVo); |
|
|
|
wxMerchantVo = listCVo.get(0); |
|
|
|
result.put("merchant", wxMerchantVo.getMerchantName()); |
|
|
|
WxShopVo wxShopVo = wxMerchantVo.getShopVoList().parallelStream().filter(s -> StringUtils.isNotEmpty(s.getLinkPhone())).findAny().orElse(null); |
|
|
|
WxShopVo wxShopVo = wxMerchantVo.getShopVoList().stream().filter(s -> StringUtils.isNotEmpty(s.getLinkPerson())).findFirst().orElse(null); |
|
|
|
if (wxShopVo != null) { |
|
|
|
String linkPerson = wxShopVo.getLinkPerson(); |
|
|
|
String linkPhone = wxShopVo.getLinkPhone(); |
|
|
|
|