Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test

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

@@ -269,20 +269,25 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         List<OrderChild> orderChildren = orderChildDao.selectInTransitOrderChildLtUnsettle(orderNo);
 
         if (CollectionUtil.isNotEmpty(orderChildren)) {
+            log.info("当前订单{},存在在途运单,不予锁定", orderNo);
             orderChildrenFlag = true;
         } else {
             List<SettlementOwnerDetail> ownerDetails = settlementOwnerDetailDao.selectListByOrderNo(orderNo);
             if (CollectionUtil.isNotEmpty(ownerDetails)) {
+                log.info("当前订单{},存在结算单编号是null的货主计费,不予锁定", orderNo);
+
                 ownerDetailsFlag = true;
             } else {
                 //开票标识“网运单”，预付标识“未预付”，借款标识”未借款“的车主计费，如存在不允许锁定
                 SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.selectLoanFlag(orderNo);
                 if (settlementDriverDetail != null) {
+                    log.info("当前订单{},开票标识“网运单”，预付标识“未预付”，借款标识”未借款“的车主计费,不予锁定", orderNo);
                     loanFlag = true;
                 } else {
                     //开票标识“网运单”，预付标识“未预付”，借款类型“虚拟货币”，借款标识”已借款“的车主计费，如存在不允许锁定
                     settlementDriverDetail = settlementDriverDetailDao.selectLoanTypeFlag(orderNo);
                     if (settlementDriverDetail != null) {
+                        log.info("当前订单{},开票标识“网运单”，预付标识“未预付”，借款标识”未借款“的车主计费,不予锁定", orderNo);
                         loanFlag = true;
                     }
                 }