bug修改

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/ShipTradeOrderCreateReqVO.java

@@ -252,6 +252,12 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
         @NotNull(message = "产品类型不能为空")
         private Integer productType;
 
+        @Schema(description = "登船时间")
+        private Date boardingTime;
+
+        @Schema(description = "离开时间")
+        private Date leaveTime;
+
         @Schema(description = "单价", example = "")
         private BigDecimal price;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderOtcCreateVO.java

@@ -26,9 +26,12 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "订单联系人")
     private String linkMan;
 
-    @Schema(description = "时间")
+    @Schema(description = "登船时间")
     private Date boardingTime;
 
+    @Schema(description = "离开时间")
+    private Date leaveTime;
+
     @Schema(description = "联系人手机")
     private String linkMobile;
 

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

@@ -2,6 +2,7 @@ package com.yc.ship.module.trade.service.order.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -684,11 +685,13 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     //订单详情
                     TradeDetailDO tradeDetailDO = new TradeDetailBO();
                     tradeDetailDO.setOrderId(tradeOrderDO.getId());
-                    tradeDetailDO.setUseDate(orderItem.getUseDate() == null ? DateUtil.toLocalDateTime(tradeOrderDO.getTravelDate()) : DateUtil.toLocalDateTime(orderItem.getUseDate()));
+                    tradeDetailDO.setUseDate(orderDetail.getBoardingTime() == null ? DateUtil.toLocalDateTime(tradeOrderDO.getTravelDate()) : DateUtil.toLocalDateTime(orderDetail.getBoardingTime()));
                     tradeDetailDO.setProductId(product.getId());
                     tradeDetailDO.setProductName(product.getProductName());
                     tradeDetailDO.setPrice(orderDetail.getOriginPrice());
                     tradeDetailDO.setActualPrice(orderDetail.getPrice());
+                    tradeDetailDO.setValidityStartDate(LocalDateTimeUtil.of(orderDetail.getBoardingTime()));
+                    tradeDetailDO.setValidityEndDate(LocalDateTimeUtil.of(orderDetail.getLeaveTime()));
                     tradeDetailDO.setSpecType(orderDetail.getSpecType());
                     tradeDetailDO.setId(IdWorker.getId());
                     tradeDetailDO.setProductType(orderDetail.getProductType());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1587,6 +1587,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 visitorDetailId.setPrice(tradeVistorReqVO.getActualPrice());
                 visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
                 visitorDetailId.setProductType(0);
+                visitorDetailId.setBoardingTime(createVO.getBoardingTime());
+                visitorDetailId.setLeaveTime(createVO.getLeaveTime());
+                visitorDetailId.setProductType(0);
                 ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
                 visitorList.add(visitor);
                 visitorDetailId.setVisitorList(visitorList);
@@ -1862,6 +1865,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 visitorDetailId.setPrice(tradeVistorReqVO.getPrice());
                 visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
                 visitorDetailId.setProductType(0);
+                visitorDetailId.setBoardingTime(createVO.getBoardingTime());
+                visitorDetailId.setLeaveTime(createVO.getLeaveTime());
                 ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
                 visitorList.add(visitor);
                 visitorDetailId.setVisitorList(visitorList);