Merge remote-tracking branch 'origin/main' into main

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

@@ -293,6 +293,8 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
 
         @Schema(description = "性别 0：未知 1：男 2：女", example = "")
         private Integer gender;
+        @Schema(description = "生日")
+        private String birthday;
 
         @Schema(description = "是否重庆中转 0：否 1是")
         private Integer cqzz;
@@ -300,9 +302,6 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
         @Schema(description = "是否宜昌中转 0：否 1是")
         private Integer yczz;
 
-        @Schema(description = "生日", example = "")
-        private String bithday;
-
         @Schema(description = "证件号", example = "")
         private String credentialNo;
 
@@ -323,8 +322,19 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
         @Schema(description = "房间id", example = "")
         private String roomId;
 
+        @Schema(description = "预分房间ID", example = "")
+        private String initRoomId;
+
+        @Schema(description = "实际入住房间ID", example = "")
+        private String finalRoomId;
+
         @Schema(description = "同住关系", example = "")
         private String cohabitation;
+
+        @Schema(description = "备注")
+        private String remark;
+        @Schema(description = "游客类型", example = "")
+        private String type;
     }
 
 

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

@@ -56,4 +56,10 @@ public class TradeVistorReqVO {
 
     @Schema(description = "同住关系")
     private String cohabitation;
+
+    @Schema(description = "年龄", example = "")
+    private Integer age;
+
+    @Schema(description = "游客类型 0 成人 1儿童")
+    private String type;
 }

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

@@ -117,4 +117,28 @@ public class TradeVisitorDO extends TenantBaseDO {
     @Schema(description = "国籍名称")
     @TableField(exist = false)
     private String nationalityName;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "预分房间ID", example = "")
+    private String initRoomId;
+
+    @Schema(description = "实际入住房间ID", example = "")
+    private String finalRoomId;
+
+    @Schema(description = "入住日期", example = "")
+    private String inDate;
+
+    @Schema(description = "离开日期", example = "")
+    private String outDate;
+
+    @Schema(description = "年龄", example = "")
+    private Integer age;
+
+    @Schema(description = "游客类型", example = "")
+    private String type;
+
+    @Schema(description = "地址", example = "")
+    private String address;
 }

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

@@ -889,7 +889,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             try {
                 productSpuRespDTO = productApi.getProduct(Long.parseLong(orderItem.getProductId())).getData();
             } catch (Exception e) {
-                log.error("获取产品信息失败：{}", e);
+                log.error("获取产品信息失败："+e);
             }
         }
         if (productSpuRespDTO == null) {
@@ -907,7 +907,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             List<String> ticketNoList = tradeUUCodeUtils.generateTicketNo(orderDetail.getVisitorList().size());
             int i = 0;
             ProductSpuRespDTO product;
-            if (orderDetail.getProductType() == 1) {
+            if (orderDetail.getProductType() == 1||orderDetail.getProductType() == 2) {
                 product = productApi.getProduct(Long.parseLong(orderDetail.getProductId())).getCheckedData();
             } else {
                 product = finalProductSpuRespDTO;
@@ -942,10 +942,18 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeVisitorDO.setDetailId(tradeDetailDO.getId());
                 tradeVisitorDO.setCredentialType(visitor.getCredentialType());
                 tradeVisitorDO.setCredentialNo(visitor.getCredentialNo());
+                tradeVisitorDO.setMobile(visitor.getMobile());
+                tradeVisitorDO.setAge(visitor.getAge());
+                tradeVisitorDO.setType(visitor.getType());
+                tradeVisitorDO.setBirthday(visitor.getBirthday());
+                tradeVisitorDO.setGender(visitor.getGender());
+                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());
                 tradeVisitorDO.setCreateTime(LocalDateTime.now());
                 tradeVisitorDOList.add(tradeVisitorDO);
             }

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

@@ -1835,6 +1835,21 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderDetail.setCount(visitorList.size());
 
         BigDecimal spuMoney = new BigDecimal(0);
+        //[ {
+        //  "productId" : 1995379153741963265,
+        //  "required" : 1,
+        //  "price" : 50,
+        //  "tourist" : [ ]
+        //}, {
+        //  "productId" : 1966419302406098945,
+        //  "required" : 1,
+        //  "price" : 50,
+        //  "tourist" : [ ]
+        //}, {
+        //  "productId" : 1966037573074767874,
+        //  "price" : 100,
+        //  "tourist" : [ "c20d5bd5-9583-4986-9889-ecc127585bd8", "8dab0347-60d0-4c34-aab1-1f0e0260e3a6" ]
+        //} ]
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
             ShipTradeOrderCreateReqVO.OrderDetail orderDetail1 = new ShipTradeOrderCreateReqVO.OrderDetail();
             //0 游船产品 1 附加产品 2：赠票
@@ -1858,11 +1873,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     visitor.setMobile(tradeVistorReqVO.getPhone());
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
+                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
+                    visitor.setGender(tradeVistorReqVO.getSex());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                    visitor.setType(tradeVistorReqVO.getType());
+                    visitor.setAge(tradeVistorReqVO.getAge());
                     visitorList1.add(visitor);
                     spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
                 }
@@ -1880,8 +1899,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     visitor.setYczz(tradeVistorReqVO.getYichang());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
+                    visitor.setGender(tradeVistorReqVO.getSex());
+                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                    visitor.setType(tradeVistorReqVO.getType());
+                    visitor.setAge(tradeVistorReqVO.getAge());
                     visitorList1.add(visitor);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -1993,7 +2016,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         visitor.setRoomId(tradeVistorReqVO.getRoomId());
         visitor.setNationality(tradeVistorReqVO.getNationality());
         visitor.setGender(tradeVistorReqVO.getSex());
-        visitor.setBithday(tradeVistorReqVO.getBirthday());
+        visitor.setBirthday(tradeVistorReqVO.getBirthday());
+        visitor.setType(tradeVistorReqVO.getType());
+        visitor.setAge(tradeVistorReqVO.getAge());
         return visitor;
     }
 
@@ -2087,8 +2112,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setYczz(tradeVistorReqVO.getYichang());
             visitor.setCqzz(tradeVistorReqVO.getChongqing());
             visitor.setRoomId(tradeVistorReqVO.getRoomId());
+            visitor.setAge(tradeVistorReqVO.getAge());
+            visitor.setBirthday(tradeVistorReqVO.getBirthday());
+            visitor.setGender(tradeVistorReqVO.getSex());
             visitor.setNationality(tradeVistorReqVO.getNationality());
             visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+            visitor.setType(tradeVistorReqVO.getType());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);
@@ -2124,7 +2153,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
+                    visitor.setAge(tradeVistorReqVO.getAge());
+                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
+                    visitor.setGender(tradeVistorReqVO.getSex());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
+                    visitor.setNationality(tradeVistorReqVO.getNationality());
+                    visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                    visitor.setRoomId(tradeVistorReqVO.getRoomId());
+                    visitor.setType(tradeVistorReqVO.getType());
                     visitorList1.add(visitor);
                 }
                 orderDetail1.setVisitorList(visitorList1);

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

@@ -209,6 +209,17 @@
         <result property="mobile" column="mobile"/>
         <result property="otaDetailId" column="ota_detail_id"/>
         <result property="isInsure" column="is_insure"/>
+        <result property="age" column="age"/>
+        <result property="birthday" column="birthday"/>
+        <result property="cohabitation" column="cohabitation"/>
+        <result property="type" column="type"/>
+        <result property="roomId" column="room_id"/>
+        <result property="remark" column="remark"/>
+        <result property="initRoomId" column="init_room_id"/>
+        <result property="finalRoomId" column="final_room_id"/>
+        <result property="inDate" column="in_date"/>
+        <result property="outDate" column="out_date"/>
+        <result property="nationality" column="nationality"/>
     </resultMap>
 
 
@@ -244,7 +255,7 @@
     </resultMap>
 
     <select id="getOrderIdDetail" resultMap="MiddleWareDtoResultMap">
-        SELECT td.*,tv.detail_id,tv.name,tv.id visitorId,tv.gender,tv.credential_no,
+        SELECT td.*,tv.detail_id,tv.name,tv.id visitorId,tv.gender,tv.credential_no,tv.age,tv.birthday,tv.nationality,tv.cohabitation,tv.room_id,tv.in_date,tv.out_date,tv.remark,tv.init_room_id,tv.final_room_id,tv.type,
                tv.credential_type, tv.mobile,tv.ota_detail_id,tv.is_insure,pc.full_path_name,p.product_tag,p.product_tag2
         FROM trade_detail td
         left join product_spu p on p.id = td.product_id