Merge branch 'v6.4_transportation_20231110' of…

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

 package com.clx.performance.service.impl.settle;
 
 import com.clx.performance.config.MslPaymentConfig;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PayRemarkEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
@@ -15,6 +17,7 @@ import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementPlatformEnum;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OwnerInfoService;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
@@ -82,6 +85,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private MslPaymentConfig mslPaymentConfig;
 
+    @Autowired
+    private OrderChildDao orderChildDao;
+
 
 
     @Override
@@ -119,10 +125,14 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
         }
 
-        settlementDriverSave(settlementDriverDetail,settlementNo);
-
         //车主结算单自动支付
         paySettlementDriver(settlementDriverDetail);
+        //生成车主结算单
+        settlementDriverSave(settlementDriverDetail,settlementNo);
+        //运单状态修改为完成
+        OrderChild orderChild = orderChildDao.getByChildNo(settlementDriverDetail.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
+        orderChildDao.updateSettlement(orderChild);
 
         // 更新结算单
         settlementOwnerDetail.setSettlementNo(settlementNo);
@@ -163,7 +173,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementDriver.setSettlementFreight(detail.getSettlementFreight());
         settlementDriver.setInvoiceType(detail.getInvoiceType());
         settlementDriver.setSettlementPlatform(String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
-        settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
+        settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
 
         settlementDriverDao.saveEntity(settlementDriver);
     }