代码优化,下单数据存储bug

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

@@ -25,6 +25,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 import static com.yc.ship.framework.common.util.date.DateUtils.*;
@@ -69,6 +70,10 @@ public class TradeOrderRespNewVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime confirmDate;
 
+    @Schema(description = "游玩日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
+    private Date travelDate;
+
     @Schema(description = "备注")
     @ExcelProperty("备注")
     private String remark;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeVisitorDO.java

@@ -10,6 +10,8 @@ import com.yc.ship.module.trade.enums.CredentialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 游客 DO
  *
@@ -141,4 +143,8 @@ public class TradeVisitorDO extends TenantBaseDO {
 
     @Schema(description = "地址", example = "")
     private String address;
+
+    @Schema(description = "产品类型 0 游船产品 1 附加产品 2：赠票", example = "")
+    @TableField(exist = false)
+    private Integer productType;
 }

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

@@ -950,14 +950,15 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeVisitorDO.setRemark(visitor.getRemark());
                 tradeVisitorDO.setDeleted(false);
                 tradeVisitorDO.setNationality(visitor.getNationality());
-                tradeVisitorDO.setCohabitation(visitor.getCohabitation());
-                tradeVisitorDO.setRoomId(visitor.getRoomId());
-                tradeVisitorDO.setInitRoomId(visitor.getInitRoomId());
-                tradeVisitorDO.setFinalRoomId(visitor.getFinalRoomId());
+                if(orderDetail.getProductType()==0) {
+                    tradeVisitorDO.setCohabitation(visitor.getCohabitation());
+                    tradeVisitorDO.setRoomId(visitor.getRoomId());
+                    tradeVisitorDO.setInitRoomId(visitor.getInitRoomId());
+                    tradeVisitorDO.setFinalRoomId(visitor.getFinalRoomId());
+                }
                 tradeVisitorDO.setCreateTime(LocalDateTime.now());
                 tradeVisitorDOList.add(tradeVisitorDO);
             }
-
         });
 
         tradeOrderDetailBO.setTradeDetailDOList(tradeDetailDOList);

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -92,7 +92,7 @@
 
     <select id="selectShipVisitor"
             resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO">
-        select v.*,t3.id_card jzCard,t3.arrive_time jzTime,t3.phone jzPhone,t3.address jzAddress from trade_detail t inner join trade_visitor v on v.detail_id = t.id
+        select t.product_type productType,v.*,t3.id_card jzCard,t3.arrive_time jzTime,t3.phone jzPhone,t3.address jzAddress from trade_detail t inner join trade_visitor v on v.detail_id = t.id
         left join trade_order_jz_detail t3 on v.credential_no = t3.id_card and t3.deleted =0
         where t.order_id = #{orderId} and v.deleted =0 and t.product_type =0 and t.deleted =0
         group by v.id