修改bug

commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoicingVo.java

@@ -15,7 +15,7 @@ public class InvoicingVo {
     /**
      * 应收订单号
      */
-    @Schema(description = "应收订单号")
+    @Schema(description = "保司结算手续费ids")
     private List<String> incomeIds;
 
     @Schema(description = "开票的保司id")
@@ -36,4 +36,6 @@ public class InvoicingVo {
 
     @Schema(description = "税点")
     private String taxPoint;
+    @Schema(description = "应收订单号")
+    private List<String> orderNos;
 }

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -112,7 +112,7 @@ public class ReceivableController {
     @Operation(summary = "手续费开票")
     public HttpResult commissionInvoicing(@RequestBody InvoicingVo invoicingVo){
         // 设置手续费开票
-        invoicingVo.setInvoiceType("1");
+        //invoicingVo.setInvoiceType("1");
 //        boolean invoicingCheck = receivableService.invoicingCheck(invoicingVo);
 //        if(!invoicingCheck){
 //            return HttpResult.error("有订单占用");
@@ -129,10 +129,10 @@ public class ReceivableController {
     public HttpResult otherInvoicing(@RequestBody InvoicingVo invoicingVo){
         // 设置跟单费开票
         invoicingVo.setInvoiceType("2");
-        boolean invoicingCheck = receivableService.invoicingCheck(invoicingVo);
+       /* boolean invoicingCheck = receivableService.invoicingCheck(invoicingVo);
         if(!invoicingCheck){
             return HttpResult.error("有订单占用");
-        }
+        }*/
         InvoiceingResult result = receivableService.addInvoicing(invoicingVo);
         if (Objects.nonNull(result)){
             return HttpResult.ok("开票成功",result);
@@ -146,7 +146,8 @@ public class ReceivableController {
         boolean result = receivableService.invoicingCheck(invoicingVo);
         // 查询订单的应收跟单金额
 
-        return result ? HttpResult.ok("无占用") : HttpResult.error("有订单占用");
+        return HttpResult.ok("无占用");
+       // return result ? HttpResult.ok("无占用") : HttpResult.error("有订单占用");
     }
 
     @PostMapping("getReceivableCompany")

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -204,13 +204,13 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         String invoiceType = invoicingVo.getInvoiceType();
         // 私有手续费 应收金额
         if (invoiceType.equals("1")) {
-            List<String> incomeIds = invoicingVo.getIncomeIds();
-            incomeIds = incomeIds.stream()
+            List<String> orderNos = invoicingVo.getOrderNos();
+            orderNos = orderNos.stream()
                     .filter(s -> s != null && !s.trim().isEmpty())
                     .map(String::trim)
                     .distinct() // 可选，去重
                     .collect(Collectors.toList());
-            String jqSumReceivable = baseMapper.getJqSumReceivable(incomeIds);
+            String jqSumReceivable = baseMapper.getJqSumReceivable(orderNos);
             return new BigDecimal(jqSumReceivable);
         } else if (invoiceType.equals("2")) {
 

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -200,7 +200,8 @@
     <select id="getReceivablePage" resultType="com.jzg.commons.entity.finance.po.InsPlyIncome">
         SELECT
             io.signing_time,
-            io.id,
+            ipi.id,
+            io.id as 'orderNo',
             io.company_name,
             ipi.dept_name,
             ipi.agreement_name,
@@ -448,6 +449,7 @@
         LEFT JOIN ins_ply_income_invoice_link ipil ON ipil.invoice_id = ipiis.invoice_id
         LEFT JOIN ins_ply_income ipi ON ipi.id = ipil.income_id
         LEFT JOIN ins_orders io ON ipi.order_no = io.id
+        left join ptl_agreement agree on io.agreement_id = agree.id
         WHERE
         1=1
         <if test="settlementQueryVo.settlementIds != null and settlementQueryVo.settlementIds != ''">
@@ -463,7 +465,7 @@
             </foreach>
         </if>
         <if test="settlementQueryVo.agreementType != null and settlementQueryVo.agreementType != ''">
-            AND ipii.agreement_type = #{agreementType}
+            AND agree.agreement_type = #{settlementQueryVo.agreementType}
         </if>
     </select>
 
@@ -911,7 +913,7 @@
             ins_ply_income ipi
                 LEFT JOIN esm_ins_company eic ON ipi.company_id = eic.id
         WHERE
-            ipi.order_no IN
+            ipi.id IN
             <foreach collection="invoicingVo.incomeIds" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>