Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

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

@@ -302,27 +302,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         settlementDriverDetail.setSettlementNo(settlementDriver.getSettlementNo());
         settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
-
-        //车主结算单自动支付
-        log.info(" 运单号 {}, 是否是普通单 {} ",settlementDriverDetail.getChildNo(),settlementDriverDetail.getInvoiceType());
-        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
-            paySettlementDriver(settlementDriverDetail);
-        } else {
-            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
-                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
-                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
-                    && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-                settlementDriverDetail.setSettlementNo(settlementNo);
-                //插入同步网络货运待支付记录
-                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
-            }
-
-        }
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -709,46 +688,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 //        settlementService.updateSettlementDetailInvoiceType(settlementOwnerDetail.getChildNo(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
     }
 
-//    private void settlementDriverSave(SettlementDriverDetail detail,String settlementNo){
-//        SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(detail.getChildNo()).orElse(new SettlementDriver());
-//        settlementDriver.setDriverUserNo(detail.getDriverUserNo());
-//        settlementDriver.setDriverName(detail.getDriverName());
-//        settlementDriver.setSettlementNo(settlementNo);
-//        settlementDriver.setChildNo(detail.getChildNo());
-//        settlementDriver.setOrderGoodsNo(detail.getOrderGoodsNo());
-//        settlementDriver.setOrderNo(detail.getOrderNo());
-//        settlementDriver.setGoodsId(detail.getGoodsId());
-//        settlementDriver.setGoodsName(detail.getGoodsName());
-//        settlementDriver.setTruckNo(detail.getTruckNo());
-//        settlementDriver.setFreightPrice(detail.getFreightPrice());
-//        settlementDriver.setWeight(detail.getWeight());
-//        settlementDriver.setFreight(detail.getFreight());
-//        settlementDriver.setLossPrice(detail.getLossPrice());
-//        settlementDriver.setLossWeight(detail.getLossWeight());
-//        settlementDriver.setLoanFlag(detail.getLoanFlag());
-//        settlementDriver.setLossFreight(detail.getLossFreight());
-//        settlementDriver.setPrepayFreightFlag(detail.getPrepayFreightFlag());
-//        settlementDriver.setSettlementFreight(detail.getSettlementFreight());
-//        settlementDriver.setInvoiceType(detail.getInvoiceType());
-//        settlementDriver.setSettlementPlatform(detail.getInvoiceType() == 1 ?
-//                        String.valueOf(SettlementPlatformEnum.Platform.WY.getCode()):
-//                String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
-//
-//        settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
-//
-//        settlementDriver.setInvoicingCompanyId(detail.getInvoicingCompanyId());
-//        settlementDriver.setInvoicingCompanyShorterName(detail.getInvoicingCompanyShorterName());
-//        settlementDriver.setInvoicingCompanyGroupCode(detail.getInvoicingCompanyGroupCode());
-//        settlementDriver.setPlatformServiceFeeRate(detail.getPlatformServiceFeeRate());
-//        settlementDriver.setPlatformServiceFee(detail.getPlatformServiceFee());
-//
-//        if (settlementDriver.getId() == null) {
-//            settlementDriverDao.saveEntity(settlementDriver);
-//        }else {
-//            settlementDriverDao.updateEntityByKey(settlementDriver);
-//        }
-//    }
-
     @Override
     public void settlementDriverNotify(String childNo,Integer payType,String payErrorMsg){
 
@@ -1294,6 +1233,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
         if (orderChild.getConfirmTime() == null) {return;}
 
+        OrderGoods orderGoods = orderGoodsDao
+                .getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
         SettlementDriver settlementDriver = settlementDriverDao.findByChildNo(orderChild.getChildNo()).orNull();
         if (settlementDriver == null
                 || !Objects.equals(settlementDriver.getStatus(), SettlementDriverEnum.Status.DRIVER_UNCONFIRMED.getCode())
@@ -1301,6 +1243,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
+                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        //车主结算单自动支付
+        log.info(" 运单号 {}, 是否是普通单 {} ",settlementDriverDetail.getChildNo(),settlementDriverDetail.getInvoiceType());
+        if (!settlementDriverDetail.getInvoiceType().equals(SettlementOwnerEnum.InvoiceType.ONLINE.getCode())) {
+            paySettlementDriver(settlementDriverDetail);
+        } else {
+            if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),
+                    QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())
+                    && Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
+                //插入同步网络货运待支付记录
+                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
+            }
+            else if (settlementDriverDetail.getPrepayFreightFlag().equals(SettlementDriverEnum.PrepayFreightFlag.PAYED.getCode())
+                    && settlementDriverDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
+                //插入同步网络货运待支付记录
+                childSyncTransportRecordService.addOrderChildSyncTransportRecord(settlementDriverDetail);
+            }
+
+        }
+
         settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
         settlementDriverDao.updateSettleStatus(settlementDriver);