Merge remote-tracking branch 'origin/test' into test

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

@@ -403,6 +403,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
 
     @Override
     public void saveSettlementOwnerForCancelOrder(BigDecimal transportWeight,BigDecimal validFreightPrice,String orderNo,Integer cancelType) {
+
         //获取订单配置的违约金方案
         OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         if(Objects.isNull(quotationDetailVO.getLiquidatedDamagesPlanId())){
@@ -426,10 +427,12 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){
             breakStatusList.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
         }
+
         BigDecimal figure ;//总费用
 
         //订单号查询货单
         List<OrderGoods> orderGoods = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+
         if(CollectionUtils.isEmpty(orderGoods)){
             figure = transportWeight.multiply(validFreightPrice).multiply(orderCancelRule.getBeforeRatio());
         }else{