|
@@ -134,6 +134,7 @@ public class HlwInvoiceApiController extends JeecgController<HlwInvoice, IHlwInv
|
|
|
}
|
|
}
|
|
|
Double totalPayment = 0.00;
|
|
Double totalPayment = 0.00;
|
|
|
Double serviceAmount=0.00;
|
|
Double serviceAmount=0.00;
|
|
|
|
|
+ Double amount=0.00;
|
|
|
for (int i = 0; i < idsList.size(); i++) {
|
|
for (int i = 0; i < idsList.size(); i++) {
|
|
|
HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow2 = hlwSubcontractorAccountFlowService.getHlwSubcontractorAccountFlowById(idsList.get(i));
|
|
HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow2 = hlwSubcontractorAccountFlowService.getHlwSubcontractorAccountFlowById(idsList.get(i));
|
|
|
String invoiceCategoryName2=hlwSubcontractorAccountFlowService.getInvoiceCategoryNameByPaymentId(hlwSubcontractorAccountFlow2.getPaymentId());
|
|
String invoiceCategoryName2=hlwSubcontractorAccountFlowService.getInvoiceCategoryNameByPaymentId(hlwSubcontractorAccountFlow2.getPaymentId());
|
|
@@ -165,10 +166,12 @@ public class HlwInvoiceApiController extends JeecgController<HlwInvoice, IHlwInv
|
|
|
}
|
|
}
|
|
|
// paymentIdList.add(hlwSubcontractorAccountFlow2.getPaymentId());
|
|
// paymentIdList.add(hlwSubcontractorAccountFlow2.getPaymentId());
|
|
|
totalPayment = businessAccountUtils.add(totalPayment, businessAccountUtils.add(hlwSubcontractorAccountFlow2.getAmount(),hlwSubcontractorAccountFlow2.getServiceFee()));
|
|
totalPayment = businessAccountUtils.add(totalPayment, businessAccountUtils.add(hlwSubcontractorAccountFlow2.getAmount(),hlwSubcontractorAccountFlow2.getServiceFee()));
|
|
|
|
|
+ amount=businessAccountUtils.add(amount,hlwSubcontractorAccountFlow2.getAmount());
|
|
|
}
|
|
}
|
|
|
//将所有选择付款的金额总和存放到准备返回的对象里
|
|
//将所有选择付款的金额总和存放到准备返回的对象里
|
|
|
hlwSubcontractorAccountFlow1.setTotalPayment(totalPayment);
|
|
hlwSubcontractorAccountFlow1.setTotalPayment(totalPayment);
|
|
|
hlwSubcontractorAccountFlow1.setServiceAmount(serviceAmount);
|
|
hlwSubcontractorAccountFlow1.setServiceAmount(serviceAmount);
|
|
|
|
|
+ hlwSubcontractorAccountFlow1.setAmount(amount);
|
|
|
// hlwSubcontractorAccountFlow1.setPaymentIdList(paymentIdList);
|
|
// hlwSubcontractorAccountFlow1.setPaymentIdList(paymentIdList);
|
|
|
//如果都相同则返回所需开票页面参数实体对象
|
|
//如果都相同则返回所需开票页面参数实体对象
|
|
|
return Result.ok(hlwSubcontractorAccountFlow1);
|
|
return Result.ok(hlwSubcontractorAccountFlow1);
|