修改查询能否开票，金额计算

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwInvoiceApiController.java

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