Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test

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

@@ -254,6 +254,11 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
     @Override
     public BigDecimal getBreakContractFigure(String childNo) {
         OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        //自由车辆违约金额返回0元
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_GOODS_NO_FOUND);
+        if(Objects.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode(),orderGoods.getTruckDemand())){
+              return new BigDecimal("0.00");
+        }
         BreakContractDriverRule rule = breakContractDriverRuleDao.getEntityByKey(1).orNull();
         if (rule == null) {return BigDecimal.ZERO;}