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

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -709,6 +709,15 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         baseMapper.batchUpdateCancel(canCancelOrderChildList);
     }
 
+
+    @Override
+    public List<OrderChild> findListByChildNoList(List<String> childNoList) {
+        return list(lQrWrapper()
+                .in(OrderChild :: getChildNo, childNoList)
+        );
+    }
+
+
     @Override
     public int countTakeByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.countTakeByOrderGoodsNo(orderGoodsNo);
@@ -718,13 +727,4 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public int countLoadByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.countLoadByOrderGoodsNo(orderGoodsNo);
     }
-
-
-    @Override
-    public List<OrderChild> findListByChildNoList(List<String> childNoList) {
-        return list(lQrWrapper()
-                .in(OrderChild :: getChildNo, childNoList)
-        );
-    }
-
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java

@@ -20,10 +20,10 @@ public interface SettlementDriverDao extends BaseDao<SettlementDriverMapper, Set
     boolean updatePayStatus(SettlementDriver item);
 
 
-    boolean updateInvoiceCompany(SettlementDriver item);
-
     boolean updateSettleStatus(SettlementDriver item);
 
+    boolean updateInvoiceCompany(SettlementDriver item);
+
     Optional<SettlementDriver> findBySettlementNo(String settlementNo);
 
     Optional<SettlementDriver> findByChildNo(String childNo);

performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java

@@ -19,6 +19,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.broker.OrderChildBrokerMqHandlerService;
 import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.broker.OrderChildBrokerService;
+import com.clx.performance.vo.mq.broker.BrokerOrderChildDriverPayMqParam;
 import com.clx.performance.service.settle.SettlementPostService;
 import com.clx.performance.vo.mq.broker.BrokerOrderChildDriverPayMqParam;
 import com.clx.performance.vo.mq.broker.BrokerOrderChildSyncMqParam;

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

@@ -253,11 +253,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Transactional(rollbackFor = Exception.class)
     public void settlementDriverSettlement(SettlementDriverSettleMqParam mq) {
 
-        OrderChild orderChild = orderChildDao
-                .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
-        OrderGoods orderGoods = orderGoodsDao
-                .getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(mq.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -302,6 +297,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         settlementDriverDetail.setSettlementNo(settlementDriver.getSettlementNo());
         settlementDriverDetailDao.updateSettlementNo(settlementDriverDetail);
+
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -1091,7 +1087,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
         if (settlementDriver != null) {
-            settlementDriver.setPrepayFreightFlag(settlementDriverDetail.getPrepayFreightFlag());
+            settlementDriver.setInvoicingCompanyId(settlementDriverDetail.getInvoicingCompanyId());
+            settlementDriver.setInvoicingCompanyShorterName(settlementDriverDetail.getInvoicingCompanyShorterName());
+            settlementDriver.setInvoicingCompanyGroupCode(settlementDriverDetail.getInvoicingCompanyGroupCode());
         }
 
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){

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

@@ -15,7 +15,7 @@ public interface SettlementPostService {
 
     void updateInvoice(List<String> childNoList);
 
+    void driverSettle(String childNo);
     void riskAdd(Integer id);
 
-    void driverSettle(String childNo);
 }