平台协议-结算的时候按照对接人的维度进行结算

考虑回款差额

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

@@ -160,9 +160,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 //        if (count > 0){
 //            return false;
 //        }
-        auditedOrder.forEach(item -> {
-            item.setId(IdGenerate.nextId());
-        });
+        auditedOrder.forEach(item -> item.setId(IdGenerate.nextId()));
         return saveBatch(auditedOrder);
     }
 
@@ -190,7 +188,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     /**
      * 获取私有协议手续费列表
      *
-     * @param receivableQueryVo
+     * @param receivableQueryVo 列表查询条件
      * @return Page<InsPlyIncome>
      */
     @Override
@@ -234,8 +232,6 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         log.info("应收数据的二次过滤：incomeDataVO=[{}]", JSONUtil.toJsonStr(incomeDataVO));
         List<String> orderNos = incomeDataVO.getOrderNos();
         String companyId = incomeDataVO.getCompanyId();
-        String contactPerson = incomeDataVO.getContactPerson();
-        String contactPersonPhone = incomeDataVO.getContactPersonPhone();
 //        if(CollUtil.isEmpty(orderNos)){
 //            log.info("应收数据的二次过滤： 订单号不能为空");
 //            return HttpResult.error("请勾选要处理的订单信息");
@@ -413,7 +409,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                     }
                     if("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)){
                         List<String> signYears = Arrays.asList(search.split(","));
-                        return !signYears.contains(insPlyIncome.getSigningTime());
+                        return !signYears.contains(insPlyIncome.getSignYear());
                     }
                     return true;
                 };
@@ -490,7 +486,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     /**
      * 查询订单绑定的发票信息
      *
-     * @param invoicingVo
+     * @param invoicingVo 应收订单的序号集
      * @return List<String> 订单绑定的发票号
      * @author lipf
      * @date 2026/5/21 11:59
@@ -648,25 +644,25 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
         // 私有手续费 应收金额
         // 交强的总手续费（jq_commission_premium） + 商业的总手续费（sy_commission_premium）
-        if (invoiceType.equals("1")) {
-            return jqCommissionPremium.add(syCommissionPremium);
-        } else if (invoiceType.equals("2")) {
-            // 交强的总跟单费（jq_follow_premium） + 商业的总跟单费（sy_follow_premium）
-            return jqFollowPremium.add(syFollowPremium);
-        } else if (invoiceType.equals("3")) {
-            // 驾意险的总手续费（jy_commission_premium）
-            return jyCommissionPremium;
-        } else if (invoiceType.equals("4")) {
-            // 驾意险的总跟单费（jy_follow_premium）
-            return jyFollowPremium;
-        } else if (invoiceType.equals("5")) {
-            // 交强的总手续费（jq_commission_premium） + 商业的总手续费（sy_commission_premium） + 交强的总跟单费（jq_follow_premium） + 商业的总跟单费（sy_follow_premium）
-            return jqCommissionPremium.add(syCommissionPremium).add(jqFollowPremium).add(syFollowPremium);
-        } else if (invoiceType.equals("6")) {
-            // 驾意险的总手续费（jy_commission_premium） + 驾意险的总跟单费（jy_follow_premium）
-            return jyCommissionPremium.add(jyFollowPremium);
-        }
-        return null;
+        return switch (invoiceType) {
+            case "1" -> jqCommissionPremium.add(syCommissionPremium);
+            case "2" ->
+                // 交强的总跟单费（jq_follow_premium） + 商业的总跟单费（sy_follow_premium）
+                    jqFollowPremium.add(syFollowPremium);
+            case "3" ->
+                // 驾意险的总手续费（jy_commission_premium）
+                    jyCommissionPremium;
+            case "4" ->
+                // 驾意险的总跟单费（jy_follow_premium）
+                    jyFollowPremium;
+            case "5" ->
+                // 交强的总手续费（jq_commission_premium） + 商业的总手续费（sy_commission_premium） + 交强的总跟单费（jq_follow_premium） + 商业的总跟单费（sy_follow_premium）
+                    jqCommissionPremium.add(syCommissionPremium).add(jqFollowPremium).add(syFollowPremium);
+            case "6" ->
+                // 驾意险的总手续费（jy_commission_premium） + 驾意险的总跟单费（jy_follow_premium）
+                    jyCommissionPremium.add(jyFollowPremium);
+            default -> null;
+        };
     }
 
     /**
@@ -700,7 +696,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             invoice.setReceivableSupervisePremium(invoicingVo.getReceivableSupervisePremium());
             invoice.setTaxPoint(invoicingVo.getTaxPoint());
             insPlyIncomeInvoiceMapper.insert(invoice);
-            List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList<InsPlyIncomeInvoiceLink>();
+            List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList<>();
             invoicingVo.getIncomeIds().forEach(incomeId -> {
                 InsPlyIncomeInvoiceLink link = new InsPlyIncomeInvoiceLink();
                 link.setId(IdGenerate.nextId());
@@ -754,42 +750,29 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         if (CollectionUtils.isEmpty(invoiceIds)) {
             return false;
         }
-        long result = 0;
+        long result;
         final String number = "1";
-        switch (invoiceType) {
-            case number:
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getSuperviseSettlement, number));
-                break;
-            case "2":
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getOtherSettlement, number));
-                break;
-            case "3":
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getJySuperviseSettlement, number));
-                break;
-            case "4":
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getJyOtherSettlement, number));
-                break;
-            case "5":
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getPlatformSuperviseSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
-                break;
-            case "6":
-                result = baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
-                        .in(InsPlyIncome::getId, invoiceIds)
-                        .set(InsPlyIncome::getPlatformOtherSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
-                break;
-            default:
-                result = 0;
-        }
+        result = switch (invoiceType) {
+            case number -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getSuperviseSettlement, number));
+            case "2" -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getOtherSettlement, number));
+            case "3" -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getJySuperviseSettlement, number));
+            case "4" -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getJyOtherSettlement, number));
+            case "5" -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getPlatformSuperviseSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
+            case "6" -> baseMapper.update(new LambdaUpdateWrapper<InsPlyIncome>()
+                    .in(InsPlyIncome::getId, invoiceIds)
+                    .set(InsPlyIncome::getPlatformOtherSettlement, number).set(InsPlyIncome::getSettlementStatus, number));
+            default -> 0;
+        };
         return result > 0;
     }
 
@@ -847,7 +830,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             invoice.setReceivableSupervisePremium(invoicingVo.getReceivablePremium());
             invoice.setTaxPoint(invoicingVo.getTaxPoint());
 
-            List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList();
+            List<InsPlyIncomeInvoiceLink> invoicingLinkList = new ArrayList<>();
 
             invoicingVo.getIncomeIds().forEach(incomeId -> {
                 InsPlyIncomeInvoiceLink link = new InsPlyIncomeInvoiceLink();
@@ -893,8 +876,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 insPlyIncomeInvoiceSettlementFileMapper.insert(files);
             }
 
-            // 判断是否已经结算完成
-            if (surplusPremium.compareTo(settlementVo.getActualReceivedAmount()) == 0) {
+            // 判断是否已经结算完成, 考虑回款差额
+            if (surplusPremium.compareTo(settlementVo.getActualReceivedAmount().add(platformSettlementVo.getSettlementVo().getPaymentDifference())) == 0) {
                 log.info("序号为[{}]的发票已经结算完成",invoice.getId());
                 // 更新发票状态
                 invoice.setStatus("1");
@@ -1044,7 +1027,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     /**
      * 导出应收开票模板
-     * @return
+     * @return String 导出时的提示信息
      */
     @Override
     public String exportAccountsReceivableInvoiceTemplate() {
@@ -1272,9 +1255,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 List<String> incomeIds = new ArrayList<>();
                 insPlyIncomeInvoiceLinkMapper.selectList(new LambdaQueryWrapper<InsPlyIncomeInvoiceLink>()
                                 .eq(InsPlyIncomeInvoiceLink::getInvoiceId, settlementVo.getInvoicingId()))
-                        .forEach(item -> {
-                            incomeIds.add(item.getIncomeId());
-                        });
+                        .forEach(item -> incomeIds.add(item.getIncomeId()));
                 // 判断是需要更新哪个字段
                 this.updateIncomeSettlementStatus(insPlyIncomeInvoice.getInvoiceType(), incomeIds);
             }else{
@@ -1302,8 +1283,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             EasyExcel.read(inputStream, SuperviseExcelVo.class, listener)
                     .sheet()
                     .doRead();
-            List<SuperviseExcelVo> dataList = listener.getDataList();
-            return dataList;
+            return listener.getDataList();
         } catch (Exception e) {
             log.error("导入excel异常。",e);
             return null;
@@ -1317,10 +1297,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             EasyExcel.read(inputStream, OtherExcelVo.class, listener)
                     .sheet()
                     .doRead();
-            List<OtherExcelVo> dataList = listener.getDataList();
-            return dataList;
+            return listener.getDataList();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("importOtherExcel异常",e);
             return null;
         }
     }
@@ -1332,10 +1311,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             EasyExcel.read(inputStream, ReceivableExportExcelVo.class, listener)
                     .sheet()
                     .doRead();
-            List<ReceivableExportExcelVo> dataList = listener.getDataList();
-            return dataList;
+            return listener.getDataList();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("importReceivableExcel异常",e);
             return null;
         }
     }
@@ -1346,10 +1324,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             EasyExcel.read(inputStream, InvoiceReceivableExportExcelVo.class, listener)
                     .sheet()
                     .doRead();
-            List<InvoiceReceivableExportExcelVo> dataList = listener.getDataList();
-            return dataList;
+            return listener.getDataList();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("importInvoiceReceivableExcel异常",e);
             return null;
         }
     }
@@ -1361,10 +1338,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
             EasyExcel.read(inputStream, OtherExcelVo.class, listener)
                     .sheet()
                     .doRead();
-            List<JyExcelVo> dataList = listener.getDataList();
-            return dataList;
+            return listener.getDataList();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("importJyExcel异常",e);
             return null;
         }
     }
@@ -1893,8 +1869,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public List<InsPlyIncomeInvoiceSettlement> getInvoiceRecordDetail(String id) {
-        List<InsPlyIncomeInvoiceSettlement> insPlyIncomeInvoiceSettlements = insPlyIncomeInvoiceSettlementMapper.selectList(new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlement>().eq(InsPlyIncomeInvoiceSettlement::getInvoiceId, id));
-        return insPlyIncomeInvoiceSettlements;
+        return insPlyIncomeInvoiceSettlementMapper.selectList(new LambdaQueryWrapper<InsPlyIncomeInvoiceSettlement>().eq(InsPlyIncomeInvoiceSettlement::getInvoiceId, id));
     }
 
     private void verifyUploadPath() throws IOException {
@@ -1908,8 +1883,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     /**
      * 导出应收手续费数据 (车险)
      *
-     * @param receivableQueryVo
-     * @return
+     * @param receivableQueryVo 导出数据的筛选条件
      */
     @Override
     public void exportSuperviseExcel(ReceivableQueryVo receivableQueryVo) {
@@ -1967,8 +1941,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     /**
      * 应收手续费结算记录
      *
-     * @param settlementQueryVo
-     * @return
+     * @param settlementQueryVo 查询条件
+     * @return Page<ExportSuperviseSettlementExcelDto>
      */
     @Override
     public Page<ExportSuperviseSettlementExcelDto> superviseSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) {
@@ -1984,8 +1958,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     /**
      * 平台协议结算记录
      *
-     * @param settlementQueryVo
-     * @return
+     * @param settlementQueryVo 查询条件
+     * @return Page<ExportSuperviseSettlementExcelDto>
      */
     @Override
     public Page<ExportSuperviseSettlementExcelDto> platformSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) {