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

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

@@ -154,6 +154,8 @@ public class HlwInvoiceApiController extends JeecgController<HlwInvoice, IHlwInv
                     }
                 }
                 serviceAmount = businessAccountUtils.add(serviceAmount, businessAccountUtils.add(hlwSubcontractorAccountFlow2.getCompanyCpAmount(),hlwSubcontractorAccountFlow2.getCompanyCpServiceFee()));
+                companyCpAmount=businessAccountUtils.add(companyCpAmount,hlwSubcontractorAccountFlow2.getCompanyCpAmount());
+                companyCpServiceFee=businessAccountUtils.add(companyCpServiceFee,hlwSubcontractorAccountFlow2.getCompanyCpServiceFee());
             }else{
                 //选择多个如果选择的付款企业和收款服务商有不同的则返回错误提示
                 if (i < idsList.size() - 1) {
@@ -166,13 +168,11 @@ public class HlwInvoiceApiController extends JeecgController<HlwInvoice, IHlwInv
                         return Result.error("请选择付款企业、收款服务商、服务内容都相同的数据");
                     }
                 }
+                amount=businessAccountUtils.add(amount,hlwSubcontractorAccountFlow2.getAmount());
+                serviceFee=businessAccountUtils.add(serviceFee,hlwSubcontractorAccountFlow2.getServiceFee());
             }
 //            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);