|
@@ -865,13 +865,15 @@ public class SettlementOrderLogic {
|
|
|
List<PgOrderBase> pgOrderBaseList1 = pgOrderBases.stream().filter(item -> orderWorkerIds.contains(item.getId()))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
- if (CollectionUtils.isEmpty(pgOrderBaseList1)) {
|
|
|
+ if (CollectionUtils.isEmpty(pgOrderBaseList1))
|
|
|
+ continue;
|
|
|
|
|
|
- record.setDzzfs(pgOrderBaseList1.size());
|
|
|
- int sum = pgOrderBaseList1.stream().mapToInt(PgOrderBase::getTotalNum).sum();
|
|
|
|
|
|
- record.setDzzfsbts(sum);
|
|
|
- }
|
|
|
+
|
|
|
+ record.setDzzfs(pgOrderBaseList1.size());
|
|
|
+ int sum = pgOrderBaseList1.stream().mapToInt(PgOrderBase::getTotalNum).sum();
|
|
|
+
|
|
|
+ record.setDzzfsbts(sum);
|
|
|
|
|
|
BigDecimal bigDecimal = workerOrderList.stream().map(WorkerOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
|
|
|
|