Merge remote-tracking branch 'origin/main'

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdistributeNew/vo/VoyageStockDistributeNewRespVO.java

@@ -25,6 +25,9 @@ public class VoyageStockDistributeNewRespVO {
     @Schema(description = "库存数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private BigDecimal num;
 
+    @Schema(description = "预定数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private BigDecimal bookNum;
+
     @Schema(description = "分配的房型房间数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private BigDecimal roomModelNum;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -804,11 +804,11 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     tradeDetailDO.setPrice(orderDetail.getOriginPrice()==null?BigDecimal.ZERO:orderDetail.getOriginPrice());
                     tradeDetailDO.setActualPrice(orderDetail.getPrice()==null?BigDecimal.ZERO:orderDetail.getPrice());
                     tradeDetailDO.setSpecType(orderDetail.getSpecType());
-                    if(orderDetail.getId()!=null){
-                        tradeDetailDO.setId(orderDetail.getId());
-                    }else{
+//                    if(orderDetail.getId()!=null){
+//                        tradeDetailDO.setId(orderDetail.getId());
+//                    }else{
                         tradeDetailDO.setId(IdWorker.getId());
-                    }
+//                    }
                     tradeDetailDO.setValidityStartDate(LocalDateTimeUtil.of(orderDetail.getBoardingTime()));
                     tradeDetailDO.setValidityEndDate(LocalDateTimeUtil.of(orderDetail.getLeaveTime()));
                     tradeDetailDO.setProductType(orderDetail.getProductType());