Merge branch 'v17.5_order_child_sync_broker_20240617' into test

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

@@ -112,6 +112,11 @@ public class OrderChildLoanComponent {
             log.info("2.百分百预付不需要考虑借款账户");
             return;
         }
+        if (!Objects.equals(orderInfoVO.getSupportLoan(), StatusEnum.YES.getCode())){
+            log.info("3.2当前运单不支持货主借款");
+            return;
+        }
+
 
         List<OrderChildLoanRetryRecord> orderChildLoanRetryRecordList = orderChildLoanRetryRecordDao.listByField(OrderChildLoanRetryRecord::getOwnerUserNo, ownerInfoFeignVO.getUserNo());
         if (CollectionUtil.isNotEmpty(orderChildLoanRetryRecordList)) {

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

@@ -2033,7 +2033,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                     data.getResidue(),deposit.longValue(),truckOwnerFlag);
             //判断余额是否能够缴纳保证金
             if (data.getResidue() < deposit.longValue()) {
-                String remark = truckOwnerFlag ? "账户可用余额不足，接单保证金冻结失败，请尽快充值，本次需重置"+deposit.movePointLeft(2) +"元" : "车主钱包余额不足，保证金冻结失败请联系车主充值";
+                String remark = truckOwnerFlag ? "账户可用余额不足，接单保证金冻结失败，请尽快充值，本次需充值"+deposit.movePointLeft(2) +"元" : "车主钱包余额不足，保证金冻结失败请联系车主充值";
               if(truckOwnerFlag){
                   throw new ServiceSystemException(PerformanceResultEnum.APP_POP_UP_OWNER_RESIDUE_ERROR, remark);
               }else{