|
@@ -66,6 +66,7 @@ import java.util.Collections;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.Objects;
|
|
import java.util.Optional;
|
|
import java.util.Optional;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.TimeUnit;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
@@ -498,8 +499,10 @@ public class WmPayOffController {
|
|
.map(WmScorePackageSettleNote::getSettleAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
.map(WmScorePackageSettleNote::getSettleAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
// 实际结算金额
|
|
// 实际结算金额
|
|
BigDecimal actualAmount = settleNotes.stream()
|
|
BigDecimal actualAmount = settleNotes.stream()
|
|
- .map(WmScorePackageSettleNote::getActualAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
- totalSettleAmount = totalSettleAmount.add(settleAmount);
|
|
|
|
|
|
+ .map(WmScorePackageSettleNote::getActualAmount)
|
|
|
|
+ .filter(Objects::nonNull)
|
|
|
|
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
+ totalSettleAmount = totalSettleAmount.add(actualAmount);
|
|
packageDetail.setSubjectLocation(settleNotes.get(0).getSubjectLocation().getDescription());
|
|
packageDetail.setSubjectLocation(settleNotes.get(0).getSubjectLocation().getDescription());
|
|
packageDetail.setSettleAmount(String.valueOf(settleAmount));
|
|
packageDetail.setSettleAmount(String.valueOf(settleAmount));
|
|
packageDetail.setActualAmount(String.valueOf(actualAmount));
|
|
packageDetail.setActualAmount(String.valueOf(actualAmount));
|