Merge remote-tracking branch 'origin/v5.5_settlement_20231011' into v5.5_settlement_20231011

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

@@ -6,8 +6,10 @@ import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.enums.settle.SettlementPlatformEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.settle.SettlementDriver;
 import com.clx.performance.model.settle.SettlementDriverDetail;
@@ -88,7 +90,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             }
         }
 
-        settlementDriverSave(settlementDriverDetail);
+        settlementDriverSave(settlementDriverDetail,settlementOwner.getSettlementNo());
 
         // 更新结算单
         settlementOwnerDetail.setSettlementNo(settlementOwner.getSettlementNo());
@@ -109,8 +111,27 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementService.updateSettlementDetailInvoiceType(settlementOwnerDetail.getChildNo(), SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
     }
 
-    private void settlementDriverSave(SettlementDriverDetail settlementDriverDetail){
+    private void settlementDriverSave(SettlementDriverDetail detail,String settlementNo){
         SettlementDriver settlementDriver = 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.setLossFreight(detail.getLossFreight());
+        settlementDriver.setSettlementFreight(detail.getSettlementFreight());
+        settlementDriver.setInvoiceType(detail.getInvoiceType());
+        settlementDriver.setSettlementPlatform(String.valueOf(SettlementPlatformEnum.Platform.MSL.getCode()));
+        settlementDriver.setStatus(SettlementDriverEnum.Status.WAIT_SETTLEMENT.getCode());
 
         settlementDriverDao.saveEntity(settlementDriver);
     }