承运与无车承运对接

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

@@ -40,6 +40,7 @@ import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
+import com.clx.performance.service.settle.SettlementCommonService;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.AllArgsConstructor;
@@ -93,6 +94,8 @@ public class OrderChildLoanComponent {
 
     private final OrderService orderService;
 
+    private final SettlementCommonService settlementCommonService;
+
     /**
      * 接单校验判断
      *
@@ -214,7 +217,7 @@ public class OrderChildLoanComponent {
 
         log.info("1.运单确认收货后借款相关处理执行");
         //临时结算金额,借款抵扣后需要重新赋值结算金额为0,如果不需要借款相关逻辑,正常设置结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         OwnerQuotationDetailVO quotationDetailVO = orderFeign.getQuotationByOrderNo(settlementDriverDetail.getOrderNo()).getData();
         BigDecimal freightFreezeRate = quotationDetailVO.getFreightFreezeRate();
@@ -548,19 +551,6 @@ public class OrderChildLoanComponent {
         return false;
     }
 
-
-    /**
-     * 抵扣金额
-     */
-    private BigDecimal settlementFreightCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
-        if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                    .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
-        } else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice()).subtract(settlementOwnerDetail.getPrepayFreight());
-        }
-    }
-
     public Integer loanFlagTypeProcess(List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList) {
         Map<Integer, List<OwnerLoanAccountRunningWaterRecord>> listMap = runningWaterRecordList.stream().collect(Collectors.groupingBy(OwnerLoanAccountRunningWaterRecord::getLoanType));
         List<OwnerLoanAccountRunningWaterRecord> vList = listMap.get(OwnerLoanRecordEnum.LoanType.VIRTUAL_CURRENCY.getCode());

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -201,9 +201,6 @@ public class OrderChildSyncTransportListener {
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
@@ -238,6 +235,9 @@ public class OrderChildSyncTransportListener {
         settlementOwnerDetail.setInvoiceFreight(settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+
         //货主借款事件处理
         OwnerLoanMqDTO dto = new OwnerLoanMqDTO();
         dto.setSettlementOwnerDetail(settlementOwnerDetail);

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

@@ -154,18 +154,6 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 
     }
 
-    /**
-     * 结算金额
-     */
-    private BigDecimal settlementFreightCalc(Integer settlementWay,SettlementOwnerDetail settlementOwnerDetail){
-        if(Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())){ //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                    .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
-        }else{ //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice()).subtract(settlementOwnerDetail.getPrepayFreight());
-        }
-    }
-
     @Override
     public IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(
             PageCarrierSettlementOwnerDetailParam param) {

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

@@ -131,7 +131,7 @@ public class SettlementServiceImpl implements SettlementService {
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
         // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        settlementOwnerDetail.setSettlementFreight(settlementCommonService.settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
 
         log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
@@ -223,23 +223,4 @@ public class SettlementServiceImpl implements SettlementService {
         }
     }
 
-    /**
-     * 结算金额
-     */
-    private BigDecimal settlementFreightCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
-        if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                    .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
-        }
-        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-            //结算方式为“卸车净重（减货损）“，结算金额=开票金额-预付运费金额-借款抵扣金额。
-            return settlementOwnerDetail.getInvoiceFreight()
-                    .subtract(settlementOwnerDetail.getPrepayFreight())
-                    .subtract(settlementOwnerDetail.getLoanFreight());
-
-        }else { //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice()).subtract(settlementOwnerDetail.getPrepayFreight());
-        }
-    }
-
 }