承运与无车承运对接

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

@@ -26,6 +26,7 @@ import com.clx.performance.model.OwnerAccount;
 import com.clx.performance.model.OwnerRunningWaterRecord;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.service.settle.SettlementCommonService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementService;
 import lombok.extern.slf4j.Slf4j;
@@ -70,6 +71,8 @@ public class SettlementServiceImpl implements SettlementService {
     private InvoicingCompanyService invoicingCompanyService;
     @Autowired
     private SettlementConfig settlementConfig;
+    @Autowired
+    private SettlementCommonService settlementCommonService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -97,15 +100,15 @@ public class SettlementServiceImpl implements SettlementService {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
-            // 如果开票标识为“普通单”时，开票费率从开票公司“五寨华祥”中获取
-            settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
 
+            // 设置开票公司信息
+            // 如果开票标识为“普通单”时，开票公司“五寨华祥”
             InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompanyByGroupCode(
                     settlementConfig.getOrdinaryInvoiceCompanyGroupCode());
-            //设置开票公司信息
             settlementOwnerDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementOwnerDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
             settlementOwnerDetail.setInvoicingCompanyGroupCode(invoiceCompany.getCompanyGroupCode());
+            settlementOwnerDetail.setInvoiceServiceFeeRate(invoiceCompany.getServiceFeeRate());
 
             settlementDriverDetail.setInvoicingCompanyId(invoiceCompany.getId());
             settlementDriverDetail.setInvoicingCompanyShorterName(invoiceCompany.getCompanyShorterName());
@@ -114,17 +117,17 @@ public class SettlementServiceImpl implements SettlementService {
             if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
             }
-            // 如果开票标识为“网运单”时，开票费率取货单单所记录的开票费率
-            settlementOwnerDetail.setInvoiceServiceFeeRate(
-                    orderGoods.getInvoiceServiceFeeRate()==null? BigDecimal.ZERO : orderGoods.getInvoiceServiceFeeRate());
+
         }
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
         // 开票服务费
-        settlementOwnerDetail.setInvoiceServiceFee(invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+        settlementOwnerDetail.setInvoiceServiceFee(
+                settlementCommonService.invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
         // 开票金额
-        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
+        settlementOwnerDetail.setInvoiceFreight(
+                settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
         // 结算金额
@@ -220,41 +223,6 @@ public class SettlementServiceImpl implements SettlementService {
         }
     }
 
-    /**
-     * 开票服务费金额
-     */
-    private BigDecimal invoiceServiceFeeCalc(Integer settlementWay, SettlementOwnerDetail settlementOwnerDetail) {
-        return settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight())
-                .divide(BigDecimal.ONE.subtract(settlementOwnerDetail.getInvoiceServiceFeeRate()), 0, RoundingMode.HALF_UP)
-                .multiply(settlementOwnerDetail.getInvoiceServiceFeeRate()).setScale(0, RoundingMode.HALF_UP);
-    }
-
-    /**
-     * 开票金额
-     */
-    private BigDecimal invoiceFreightCalc(Integer settlementWay, BigDecimal invoiceServiceFeeRate, SettlementOwnerDetail settlementOwnerDetail) {
-        if (Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())) { //订单结算方式为“装车净重”时，开票金额=实际净重*平台运费报价-货损金额。
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                    .subtract(settlementOwnerDetail.getLossFreight());
-        }
-        else if (Objects.equals(settlementWay, SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-            if (invoiceServiceFeeRate!=null){
-                //结算方式为“卸车净重（减货损）”，平台运费报价为“未税”时，开票金额=平台运费单价*实际净重-货损单价*货损吨数+开票服务费。
-                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                        .subtract(settlementOwnerDetail.getLossPrice())
-                        .add(settlementOwnerDetail.getInvoiceServiceFee());
-            }
-            else{
-                //结算方式为“卸车净重（减货损）”，平台运费报价为“含税”时   开票金额=平台运费单价*实际净重-货损单价*货损吨数
-                return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
-                        .subtract(settlementOwnerDetail.getLossFreight());
-            }
-        }
-        else { //订单结算方式为“卸车净重”时，开票金额=实际净重*平台运费报价。
-            return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice());
-        }
-    }
-
     /**
      * 结算金额
      */