Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into release

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

@@ -169,6 +169,8 @@ public class OrderChildSyncTransportListener {
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         }
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+
 
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(invoiceType)) {
             if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0) {
@@ -267,4 +269,13 @@ public class OrderChildSyncTransportListener {
         }
     }
 
+    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());
+        }
+    }
+
 }

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

@@ -188,9 +188,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         if (param.getStatus()) {
             BorrowerConfig borrowerConfig = borrowerConfigDao.selectByBorrowerIdAndType(ownerLoanRecord.getBorrowerId(),
                     param.getLoanType()).orElseThrow(PerformanceResultEnum.BORROWER_CONFIG_TYPE_NOT_SUPPORT_ERROR);
-             // 借出方借款配置中，将借款类型为虚拟币的数据禁用，此时进行借款审核时，不应该再可以选择虚拟币；将资金禁用同理。
-            if ( Objects.equals(param.getLoanType(),borrowerConfig.getStatus()) &&
-                    Objects.equals(borrowerConfig.getStatus(), BorrowerConfigEnum.Status.DISABLE.getCode())){
+             // 借出方借款配置中，将借款类型的数据禁用，此时进行借款审核时，不应该再可以选择虚拟币；将资金禁用同理。
+            if (Objects.equals(borrowerConfig.getStatus(), BorrowerConfigEnum.Status.DISABLE.getCode())){
                 throw new ServiceSystemException(PerformanceResultEnum.BORROWER_CONFIG_DELETE_ENABLE_STATUS_ERROR);
             }