货主结算单借款金额处理

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -172,7 +172,7 @@ public class OrderChildLoanComponent {
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.selectLoanFlag(orderGoods.getOrderNo());
         if (settlementDriverDetail != null) {
             log.info("当前订单存在未借款,未预付的司机计费,id{}", settlementDriverDetail.getId());
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主已欠款");
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主货款不足");
         }
         //查询审批通过并且未用完的借款
         LoanBalanceDTO param = new LoanBalanceDTO();

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -38,6 +38,7 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
                 .set(SettlementOwner::getLossFreight, item.getLossFreight())
                 .set(SettlementOwner::getSettlementFreight, item.getSettlementFreight())
                 .set(SettlementOwner::getInvoiceFreight, item.getInvoiceFreight())
+                .set(SettlementOwner::getLoanFreight, item.getLoanFreight())
                 .set(SettlementOwner::getPrepayFreight, item.getPrepayFreight())
         );
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -444,6 +444,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwner.setLossWeight(settlementOwner.getLossWeight().add(item.getLossWeight()));
             settlementOwner.setLossFreight(settlementOwner.getLossFreight().add(item.getLossFreight()));
             settlementOwner.setPrepayFreight(settlementOwner.getPrepayFreight().add(item.getPrepayFreight()));
+            settlementOwner.setLoanFreight(settlementOwner.getLoanFreight().add(item.getLoanFreight()));
             settlementOwner.setSettlementFreight(settlementOwner.getSettlementFreight().add(item.getSettlementFreight()));
             settlementOwner.setInvoiceFreight(settlementOwner.getInvoiceFreight().add(item.getInvoiceFreight()));
         });