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

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

@@ -99,14 +99,14 @@ public class OrderChildLoanComponent {
 
         if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
             log.info("3.进行标吨判断");
-            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(35)), ownerInfoFeignVO, orderGoods, childNo, overWeight, quotationDetailVO.getPlatformFreightQuotation());
         } else {
             log.info("3.进行超吨判断");
-            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight);
+            determine(quotationDetailVO.getPlatformFreightQuotation().multiply(new BigDecimal(50)), ownerInfoFeignVO, orderGoods, childNo, overWeight, quotationDetailVO.getPlatformFreightQuotation());
         }
     }
 
-    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight) {
+    public void determine(BigDecimal orderChildPrice, OwnerInfoFeignVO ownerInfoFeignVO, OrderGoods orderGoods, String childNo, Integer overWeight, BigDecimal platPrice) {
         log.info("4.预估运费{},货主{},订单号{},运单号{}", orderChildPrice, ownerInfoFeignVO.getUserNo(), orderGoods.getOrderNo(), childNo);
         List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderGoods.getOrderNo());
         BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
@@ -131,9 +131,9 @@ public class OrderChildLoanComponent {
                 size = orderChildList.size();
             }
             if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
-                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(size));
+                orderChildSum = platPrice.multiply(new BigDecimal(35)).multiply(new BigDecimal(size));
             } else {
-                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
+                orderChildSum = platPrice.multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
             }
             log.info("5.1 查询未结算运单, 运单数量{},订单号{}", size, orderGoods.getOrderNo());
             BigDecimal ans = subtract.subtract(orderChildSum);

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -41,6 +41,7 @@ public class EventListenerComponent {
         OrderChildLoanRetryRecord entity = new OrderChildLoanRetryRecord();
         entity.setSettlementOwnerId(settlementOwnerDetail.getId());
         entity.setSettlementDriverId(settlementDriverDetail.getId());
+        entity.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
         // 保存重试记录
         orderChildLoanRetryRecordDao.saveEntity(entity);
     }