|
@@ -290,6 +290,7 @@ public class SwBillManagementUnpaidServiceImpl extends ServiceImpl<SwBillManagem
|
|
|
record.setId(paymentBatchId);
|
|
|
record.setDatasource(DATASOURCEBALANCEDEDUCTION);
|
|
|
record.setPaidin(BigDecimal.ZERO);
|
|
|
+ record.setDeleted("0");
|
|
|
// 计算费用
|
|
|
swBillingRecordService.calculateFees(unpaidDos, record, ownerInfo);
|
|
|
transferAccountDo.getRecordDoList().add(record);
|
|
@@ -318,6 +319,7 @@ public class SwBillManagementUnpaidServiceImpl extends ServiceImpl<SwBillManagem
|
|
|
SwBillingRecordDo record = swBillingRecordService.buildBaseBillingRecord(currentUser, ownerInfo);
|
|
|
record.setId(SecurityUtil.getUUID());
|
|
|
record.setDatasource("2");
|
|
|
+ record.setDeleted("0");
|
|
|
record.setPaidin(BigDecimal.ZERO);
|
|
|
BigDecimal zjm = zeroDueData.stream().map(SwBillManagementUnpaidDo::getFeewaiver).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
BigDecimal yyj = zeroDueData.stream().map(SwBillManagementUnpaidDo::getOughttohavepaid).reduce(BigDecimal.ZERO, BigDecimal::add);
|