fix: 修改订单下单相关接口

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceRoomModelTypeRespVO.java

@@ -12,6 +12,9 @@ import java.math.BigDecimal;
 @ExcelIgnoreUnannotated
 public class PriceRoomModelTypeRespVO {
 
+    @Schema(description = "ID", example = "1")
+    private Long id;
+
     @Schema(description = "价格模板ID或者船票价格ID", example = "13095")
     @ExcelProperty("价格模板ID或者船票价格ID")
     private Long objectId;
@@ -74,4 +77,7 @@ public class PriceRoomModelTypeRespVO {
     @Schema(description = "是否拼房", example = "true")
     private Integer enableShare;
 
+    @Schema(description = "价格单人票设置")
+    private PriceSingleSettingRespVO singleSetting;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/pricetemplate/vo/PriceSingleSettingRespVO.java

@@ -16,6 +16,12 @@ public class PriceSingleSettingRespVO {
     @ExcelProperty("房型ID")
     private Long roomModelId;
 
+    /**
+     * 房型入住模式ID
+     */
+    @ExcelProperty("房型入住模式ID")
+    private Long roomModelTypeId;
+
     @Schema(description = "成人占床")
     @ExcelProperty("成人占床")
     private BigDecimal adultTake;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/priceroommodeltype/PriceRoomModelTypeDO.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.product.dal.dataobject.priceroommodeltype;
 
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import com.yc.ship.module.product.dal.dataobject.pricesinglesetting.PriceSingleSettingDO;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -94,4 +95,10 @@ public class PriceRoomModelTypeDO extends TenantBaseDO {
      */
     private Integer enableShare;
 
+    /**
+     * 单房型加价设置
+     */
+    @TableField(exist = false)
+    private PriceSingleSettingDO singleSetting;
+
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/pricesinglesetting/PriceSingleSettingDO.java

@@ -40,6 +40,11 @@ public class PriceSingleSettingDO extends TenantBaseDO {
      * 价格模板ID或者船票价格ID
      */
     private Long objectId;
+
+    /**
+     * 房型入住模式ID
+     */
+    private Long roomModelTypeId;
     /**
      * 成人占床
      */

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricetemplate/PriceTemplateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.product.service.pricetemplate;
 
+import cn.hutool.core.util.IdUtil;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.collection.MapUtils;
@@ -136,11 +137,14 @@ public class PriceTemplateServiceImpl implements PriceTemplateService {
         List<PriceRoomModelRespVO> priceRoomModelRespVOS = BeanUtils.toBean(roomModelDOList, PriceRoomModelRespVO.class);
         List<PriceSingleSettingDO> singleSettingList = priceSingleSettingService.getByObjectId(id);
         List<PriceSingleSettingRespVO> priceSingleSettingRespVOS = BeanUtils.toBean(singleSettingList, PriceSingleSettingRespVO.class);
-        Map<Long, PriceSingleSettingRespVO> singleSettingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelId);
+        Map<Long, PriceSingleSettingRespVO> singleSettingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelTypeId);
         List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelTypeMapper.selectByObjectId(id);
-        Map<Long, List<PriceRoomModelTypeDO>> roomModelTypeMap = CollectionUtils.convertMultiMap(roomModelTypeList, PriceRoomModelTypeDO::getRoomModelId);
+        List<PriceRoomModelTypeRespVO> priceRoomModelTypeRespVOS = BeanUtils.toBean(roomModelTypeList, PriceRoomModelTypeRespVO.class);
+        priceRoomModelTypeRespVOS.stream().forEach(item -> {
+            MapUtils.findAndThen(singleSettingRespVOMap, item.getId(), item::setSingleSetting);
+        });
+        Map<Long, List<PriceRoomModelTypeRespVO>> roomModelTypeMap = CollectionUtils.convertMultiMap(priceRoomModelTypeRespVOS, PriceRoomModelTypeRespVO::getRoomModelId);
         priceRoomModelRespVOS.stream().forEach(item -> {
-            MapUtils.findAndThen(singleSettingRespVOMap, item.getRoomModelId(), item::setSingleSetting);
             MapUtils.findAndThen(roomModelTypeMap, item.getRoomModelId(), itemTypeList -> item.setRoomModelTypeList(BeanUtils.toBean(itemTypeList, PriceRoomModelTypeRespVO.class)));
         });
         respVO.setRoomModelList(priceRoomModelRespVOS);
@@ -180,19 +184,22 @@ public class PriceTemplateServiceImpl implements PriceTemplateService {
         //插入房型入住价格模式
         List<PriceRoomModelTypeDO> roomModelTypeDOList = new ArrayList<>();
         roomModelList.stream().forEach(roomModel -> {
-            PriceSingleSettingDO singleSetting = roomModel.getSingleSetting();
-            if(singleSetting != null) {
-                singleSetting.setRoomModelId(roomModel.getRoomModelId());
-                singleSetting.setObjectId(objectId);
-                singleSettingList.add(singleSetting);
-            }
             List<PriceRoomModelTypeDO> roomModelTypeList = roomModel.getRoomModelTypeList();
             if(!CollectionUtils.isAnyEmpty(roomModelTypeList)) {
                 roomModelTypeList.stream().forEach(roomModelType -> {
+                    Long roomModelTypeId = IdUtil.getSnowflakeNextId();
                     roomModelType.setRoomModelId(roomModel.getRoomModelId());
                     roomModelType.setRoomModelName(roomModel.getRoomModelName());
                     roomModelType.setObjectId(objectId);
+                    roomModelType.setId(roomModelTypeId);
                     roomModelTypeDOList.add(roomModelType);
+                    PriceSingleSettingDO singleSetting = roomModelType.getSingleSetting();
+                    if(singleSetting != null) {
+                        singleSetting.setRoomModelId(roomModel.getRoomModelId());
+                        singleSetting.setObjectId(objectId);
+                        singleSetting.setRoomModelTypeId(roomModelTypeId);
+                        singleSettingList.add(singleSetting);
+                    }
                 });
             }
         });

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/pricevoyage/PriceVoyageServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.product.service.pricevoyage;
 
+import cn.hutool.core.util.IdUtil;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.collection.MapUtils;
@@ -146,12 +147,15 @@ public class PriceVoyageServiceImpl implements PriceVoyageService {
         List<PriceRoomModelRespVO> priceRoomModelRespVOS = BeanUtils.toBean(roomModelDOList, PriceRoomModelRespVO.class);
         List<PriceSingleSettingDO> singleSettingList = priceSingleSettingMapper.selectByObjectId(id);
         List<PriceSingleSettingRespVO> priceSingleSettingRespVOS = BeanUtils.toBean(singleSettingList, PriceSingleSettingRespVO.class);
-        Map<Long, PriceSingleSettingRespVO> singleSettingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelId);
+        Map<Long, PriceSingleSettingRespVO> singleSettingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelTypeId);
         List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelTypeMapper.selectByObjectId(id);
-        Map<Long, List<PriceRoomModelTypeDO>> roomModelTypeMap = CollectionUtils.convertMultiMap(roomModelTypeList, PriceRoomModelTypeDO::getRoomModelId);
+        List<PriceRoomModelTypeRespVO> priceRoomModelTypeRespVOS = BeanUtils.toBean(roomModelTypeList, PriceRoomModelTypeRespVO.class);
+        priceRoomModelTypeRespVOS.stream().forEach(item -> {
+            MapUtils.findAndThen(singleSettingRespVOMap, item.getId(), item::setSingleSetting);
+        });
+        Map<Long, List<PriceRoomModelTypeRespVO>> roomModelTypeMap = CollectionUtils.convertMultiMap(priceRoomModelTypeRespVOS, PriceRoomModelTypeRespVO::getRoomModelId);
         priceRoomModelRespVOS.stream().forEach(item -> {
-            MapUtils.findAndThen(singleSettingRespVOMap, item.getRoomModelId(), item::setSingleSetting);
-            MapUtils.findAndThen(roomModelTypeMap, item.getRoomModelId(), itemTypeList -> item.setRoomModelTypeList(BeanUtils.toBean(itemTypeList, PriceRoomModelTypeRespVO.class)));
+            MapUtils.findAndThen(roomModelTypeMap, item.getRoomModelId(), item::setRoomModelTypeList);
         });
         respVO.setRoomModelList(priceRoomModelRespVOS);
         List<PriceFloorDO> floorDOList = priceFloorMapper.selectListByObjectId(id);
@@ -184,17 +188,19 @@ public class PriceVoyageServiceImpl implements PriceVoyageService {
         List<PriceRoomModelRespVO> priceRoomModelRespVOS = BeanUtils.toBean(roomModelDOList, PriceRoomModelRespVO.class);
         List<PriceSingleSettingDO> singleSettingDO = priceSingleSettingMapper.selectByObjectId(id);
         List<PriceSingleSettingRespVO> priceSingleSettingRespVOS = BeanUtils.toBean(singleSettingDO, PriceSingleSettingRespVO.class);
-        Map<Long, PriceSingleSettingRespVO> settingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelId);
+        Map<Long, PriceSingleSettingRespVO> settingRespVOMap = CollectionUtils.convertMap(priceSingleSettingRespVOS, PriceSingleSettingRespVO::getRoomModelTypeId);
 
         List<Long> roomModelIds = CollectionUtils.convertList(priceRoomModelRespVOS, item -> item.getRoomModelId());
         List<ResourceRoomModelDO> roomModelDOS = roomModelService.getList(roomModelIds);
         Map<Long, ResourceRoomModelDO> resourceRoomModelDOMap = CollectionUtils.convertMap(roomModelDOS, item -> item.getId());
         List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelTypeMapper.selectByObjectId(id);
-        Map<Long, List<PriceRoomModelTypeDO>> roomModelTypeMap = CollectionUtils.convertMultiMap(roomModelTypeList, PriceRoomModelTypeDO::getRoomModelId);
+        List<PriceRoomModelTypeRespVO> priceRoomModelTypeRespVOS = BeanUtils.toBean(roomModelTypeList, PriceRoomModelTypeRespVO.class);
+        priceRoomModelTypeRespVOS.stream().forEach(item -> {
+            MapUtils.findAndThen(settingRespVOMap, item.getId(), item::setSingleSetting);
+        });
+        Map<Long, List<PriceRoomModelTypeRespVO>> roomModelTypeMap = CollectionUtils.convertMultiMap(priceRoomModelTypeRespVOS, PriceRoomModelTypeRespVO::getRoomModelId);
         priceRoomModelRespVOS.stream().forEach(item -> {
-            MapUtils.findAndThen(roomModelTypeMap, item.getRoomModelId(), itemTypeList -> item.setRoomModelTypeList(BeanUtils.toBean(itemTypeList, PriceRoomModelTypeRespVO.class)));
-            MapUtils.findAndThen(settingRespVOMap, item.getRoomModelId(), item::setSingleSetting);
-            item.setSingleSetting(settingRespVOMap.get(item.getRoomModelId()));
+            MapUtils.findAndThen(roomModelTypeMap, item.getRoomModelId(), item::setRoomModelTypeList);
             if(resourceRoomModelDOMap.get(item.getRoomModelId()) != null) {
                 item.setRoomModel(BeanUtils.toBean(resourceRoomModelDOMap.get(item.getRoomModelId()), ResourceRoomModelRespVO.class));
             }
@@ -246,19 +252,22 @@ public class PriceVoyageServiceImpl implements PriceVoyageService {
         //插入房型入住价格模式
         List<PriceRoomModelTypeDO> roomModelTypeDOList = new ArrayList<>();
         roomModelList.stream().forEach(roomModel -> {
-            PriceSingleSettingDO singleSetting = roomModel.getSingleSetting();
-            if(singleSetting != null) {
-                singleSetting.setRoomModelId(roomModel.getRoomModelId());
-                singleSetting.setObjectId(objectId);
-                singleSettingList.add(singleSetting);
-            }
             List<PriceRoomModelTypeDO> roomModelTypeList = roomModel.getRoomModelTypeList();
             if(!CollectionUtils.isAnyEmpty(roomModelTypeList)) {
                 roomModelTypeList.stream().forEach(roomModelType -> {
+                    Long roomModelTypeId = IdUtil.getSnowflakeNextId();
+                    roomModelType.setId(roomModelTypeId);
                     roomModelType.setRoomModelId(roomModel.getRoomModelId());
                     roomModelType.setRoomModelName(roomModel.getRoomModelName());
                     roomModelType.setObjectId(objectId);
                     roomModelTypeDOList.add(roomModelType);
+                    PriceSingleSettingDO singleSetting = roomModelType.getSingleSetting();
+                    if(singleSetting != null) {
+                        singleSetting.setRoomModelId(roomModel.getRoomModelId());
+                        singleSetting.setObjectId(objectId);
+                        singleSetting.setRoomModelTypeId(roomModelTypeId);
+                        singleSettingList.add(singleSetting);
+                    }
                 });
             }
         });

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -9,9 +9,11 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.module.product.controller.admin.pricetemplate.vo.*;
 import com.yc.ship.module.product.controller.admin.pricevoyage.vo.PriceVoyageSaveReqVO;
 import com.yc.ship.module.product.controller.admin.voyage.vo.*;
+import com.yc.ship.module.product.dal.dataobject.basicpricearea.BasicPriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricearea.PriceAreaDO;
 import com.yc.ship.module.product.dal.dataobject.pricefloor.PriceFloorDO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodel.PriceRoomModelDO;
+import com.yc.ship.module.product.dal.dataobject.priceroommodeltype.PriceRoomModelTypeDO;
 import com.yc.ship.module.product.dal.dataobject.pricesinglesetting.PriceSingleSettingDO;
 import com.yc.ship.module.product.dal.dataobject.pricespu.PriceSpuDO;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
@@ -354,21 +356,35 @@ public class VoyageServiceImpl implements VoyageService {
                 priceVoyageSaveReqVO.setPriceMode(priceTemplate.getPriceMode());
                 priceVoyageSaveReqVO.setValidateTime(priceTemplate.getValidateTime());
                 priceVoyageSaveReqVO.setStatus(UseStatusEnum.ENABLE.getStatus());
+                // 房型价格系数
                 List<PriceRoomModelRespVO> roomModelList = priceTemplate.getRoomModelList();
                 List<PriceRoomModelDO> priceRoomModelDOS = BeanUtils.toBean(roomModelList, PriceRoomModelDO.class);
                 priceRoomModelDOS.stream().forEach(priceRoomModelDO -> {
                     priceRoomModelDO.setObjectId(priceVoyageId);
-                    priceRoomModelDO.getSingleSetting().setObjectId(priceVoyageId);
+                    List<PriceRoomModelTypeDO> roomModelTypeList = priceRoomModelDO.getRoomModelTypeList();
+                    roomModelTypeList.stream().forEach(roomModelType -> {
+                        roomModelType.setObjectId(priceVoyageId);
+                        PriceSingleSettingDO singleSetting = roomModelType.getSingleSetting();
+                        singleSetting.setObjectId(priceVoyageId);
+                    });
                 });
                 priceVoyageSaveReqVO.setRoomModelList(priceRoomModelDOS);
+                // 楼层加价
                 List<PriceFloorRespVO> floorList = priceTemplate.getFloorList();
                 List<PriceFloorDO> priceFloorDOS = BeanUtils.toBean(floorList, PriceFloorDO.class);
                 priceFloorDOS.stream().forEach(priceFloorDO -> priceFloorDO.setObjectId(priceVoyageId));
                 priceVoyageSaveReqVO.setFloorList(priceFloorDOS);
+                //区域加价
                 List<PriceAreaRespVO> areaList = priceTemplate.getAreaList();
                 List<PriceAreaDO> priceAreaDOS = BeanUtils.toBean(areaList, PriceAreaDO.class);
                 priceAreaDOS.stream().forEach(priceAreaDO -> priceAreaDO.setObjectId(priceVoyageId));
                 priceVoyageSaveReqVO.setAreaList(priceAreaDOS);
+                //区域基准价
+                List<BasicPriceAreaRespVO> basicAreaList = priceTemplate.getBasicAreaList();
+                List<BasicPriceAreaDO> basicPriceAreaDOS = BeanUtils.toBean(basicAreaList, BasicPriceAreaDO.class);
+                basicPriceAreaDOS.stream().forEach(basicPriceAreaDO -> basicPriceAreaDO.setObjectId(priceVoyageId));
+                priceVoyageSaveReqVO.setBasicAreaList(basicPriceAreaDOS);
+                // 附加产品
                 List<PriceSpuRespVO> spuList = priceTemplate.getSpuList();
                 List<PriceSpuDO> priceSpuDOS = BeanUtils.toBean(spuList, PriceSpuDO.class);
                 priceSpuDOS.stream().forEach(priceSpuDO -> priceSpuDO.setObjectId(priceVoyageId));

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

@@ -68,8 +68,8 @@ public class MiniTradeOrderCreateReqVO {
     @Schema(description = "订单总额-前端修改")
     private BigDecimal realAmount;
 
-    @Schema(description = "国籍数据")
-    List<TradeOrderCountryReqVO> countryData;
+    @Schema(description = "房间房型数据")
+    List<TradeOrderRoomModelVO> roomModelList;
 
     @Schema(description = "订单汇总信息")
     private TradeOrderTotalVO summary;

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

@@ -81,7 +81,7 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     private BigDecimal otherMoney;
 
     @Schema(description = "折扣ID")
-    private Long dicountId;
+    private Long discountId;
 
     @Schema(description = "订单联系信息", example = "")
     @NotNull(message = "联系人信息不能为空")
@@ -338,6 +338,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
         private String remark;
         @Schema(description = "游客类型", example = "")
         private String type;
+
+        @Schema(description = "房间索引ID", example = "")
+        private String roomIndexId;
     }
 
 

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

@@ -0,0 +1,91 @@
+package com.yc.ship.module.trade.controller.admin.order.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author qsl
+ */
+@Schema(description = "旅行社订单创建参数")
+@Data
+public class TradeOrderOtcCreateBakVO {
+
+    @Schema(description = "订单ID")
+    private Long orderId;
+
+    @Schema(description = "客户名称")
+    private String customerName;
+
+    @Schema(description = "订单联系人")
+    private String linkMan;
+
+    @Schema(description = "时间")
+    private Date boardingTime;
+
+    @Schema(description = "联系人手机")
+    private String linkMobile;
+
+    @Schema(description = "联系人邮箱")
+    private String linkEmail;
+
+    @Schema(description = "船ID")
+    private Long shipId;
+
+    @Schema(description = "航次ID")
+    private Long voyageId;
+
+    @Schema(description = "团队编号")
+    private String groupNo;
+
+    @Schema(description = "币种")
+    private String currency;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "是否预订单 0 否 1是")
+    private Integer isYd;
+
+    @Schema(description = "是否需要接站服务 0 否 1是")
+    private Integer isJz;
+
+    @Schema(description = "接站地址")
+    private String jzAddress;
+
+    @Schema(description = "接站联系人")
+    private String jzLinkName;
+
+    @Schema(description = "接站联系电话")
+    private String jzLinkPhone;
+
+    @Schema(description = "分销商ID", example = "MT1231312")
+    private Long distributorId;
+
+    @Schema(description = "门店ID", example = "123")
+    private Long storeId;
+
+    @Schema(description = "订单总额-前端修改")
+    private BigDecimal realAmount;
+
+    @Schema(description = "其它费用")
+    private BigDecimal otherAmount;
+
+    @Schema(description = "其它费用说明")
+    private String otherRemark;
+
+    @Schema(description = "国籍数据")
+    List<TradeOrderCountryReqVO> countryData;
+
+    @Schema(description = "订单汇总信息")
+    private TradeOrderTotalVO summary;
+
+    private List<TradeVistorReqVO> tourist;
+
+    @Schema(description = "附加产品信息")
+    private List<TradeSpuReqVO> spuList;
+
+}

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

@@ -68,21 +68,13 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "门店ID", example = "123")
     private Long storeId;
 
-    @Schema(description = "订单总额-前端修改")
-    private BigDecimal realAmount;
-
-    @Schema(description = "其它费用")
-    private BigDecimal otherAmount;
-
-    @Schema(description = "其它费用说明")
-    private String otherRemark;
-
-    @Schema(description = "国籍数据")
-    List<TradeOrderCountryReqVO> countryData;
+    @Schema(description = "房型信息")
+    private List<TradeOrderRoomModelVO> roomModelList;
 
     @Schema(description = "订单汇总信息")
     private TradeOrderTotalVO summary;
 
+    @Schema(description = "游客信息")
     private List<TradeVistorReqVO> tourist;
 
     @Schema(description = "附加产品信息")

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

@@ -0,0 +1,129 @@
+package com.yc.ship.module.trade.controller.admin.order.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "订单房型信息")
+@Data
+public class TradeOrderRoomModelVO {
+
+
+    @Schema(description = "房型索引ID", example = "")
+    private String roomIndexId;
+    /**
+     * 订单ID
+     */
+    @Schema(description = "订单ID", example = "")
+    private Long orderId;
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号", example = "")
+    private String orderNo;
+    /**
+     * 房型ID
+     */
+    @Schema(description = "房型ID", example = "")
+    private Long roomModelId;
+    /**
+     * 房型名称
+     */
+    @Schema(description = "房型名称", example = "")
+    private String roomModelName;
+    /**
+     * 楼层
+     */
+    @Schema(description = "楼层", example = "")
+    private Integer floor;
+
+    /**
+     * 原价=基准价 * 票价系数
+     */
+    @Schema(description = "原价", example = "")
+    private BigDecimal originalPrice;
+    /**
+     * 折扣
+     */
+    @Schema(description = "折扣", example = "")
+    private BigDecimal discount;
+
+    /**
+     * 房价=原价 * 分销商折扣
+     */
+    @Schema(description = "房价", example = "")
+    private BigDecimal unitPrice;
+    /**
+     * 实收金额
+     */
+    @Schema(description = "实收金额", example = "")
+    private BigDecimal realMoney;
+    /**
+     * 用房数
+     */
+    @Schema(description = "用房数", example = "")
+    private Double useRoomNum;
+
+    /**
+     * 国家加价总价
+     */
+    @Schema(description = "国家加价总价", example = "")
+    private BigDecimal countryPlusAmount;
+    /**
+     * 国家加价数
+     */
+    @Schema(description = "国家加价数", example = "")
+    private Integer countryPlusNum;
+    /**
+     * 成人数(占床)
+     */
+    @Schema(description = "成人人数(占床)", example = "")
+    private Integer adultTakeNum;
+    /**
+     * 成人加床数
+     */
+    @Schema(description = "成人加床数", example = "")
+    private Integer adultPlusNum;
+    /**
+     * 儿童不占床数
+     */
+    @Schema(description = "儿童不占床数", example = "")
+    private Integer childNonTakeNum;
+    /**
+     * 儿童占床数
+     */
+    @Schema(description = "儿童占床数", example = "")
+    private Integer childTakeNum;
+    /**
+     * 儿童加床数
+     */
+    @Schema(description = "儿童加床数", example = "")
+    private Integer childPlusNum;
+    /**
+     * 婴儿不占床数
+     */
+    @Schema(description = "婴儿不占床数", example = "")
+    private Integer babyNonTakeNum;
+    /**
+     * 婴儿占床数
+     */
+    @Schema(description = "婴儿占床数", example = "")
+    private Integer babyTakeNum;
+    /**
+     * 婴儿加床数
+     */
+    @Schema(description = "婴儿加床数", example = "")
+    private Integer babyPlusNum;
+
+    /**
+     * 升楼层单价
+     */
+    @Schema(description = "升楼层单价", example = "")
+    private BigDecimal floorPrice;
+    /**
+     * 升楼层数
+     */
+    @Schema(description = "升楼层数", example = "")
+    private Integer floorNum;
+}

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

@@ -36,6 +36,12 @@ public class TradeOrderTotalVO {
      */
     @Schema(description = "陪同总数")
     private Integer withTotalNum;
+
+    /**
+     * 陪同总价
+     */
+    @Schema(description = "陪同总价")
+    private BigDecimal withTotalNumMoney;
     /**
      * 用房总数
      */
@@ -66,6 +72,13 @@ public class TradeOrderTotalVO {
      */
     @Schema(description = "领队数")
     private Integer leaderTotalNum;
+
+    /**
+     * 领队费用
+     */
+    @Schema(description = "领队费用")
+    private BigDecimal leaderTotalMoney;
+
     /**
      * 包含服务费
      */
@@ -78,22 +91,22 @@ public class TradeOrderTotalVO {
     private BigDecimal collectionServiceMoney;
 
     @Schema(description = "折扣")
-    private Long dicountId;
+    private Long discountId;
     /**
      * 订单总额
      */
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
 
-    @Schema(description = "订单总额")
-    private BigDecimal realMoney;
+    @Schema(description = "实际总额")
+    private BigDecimal realAmount;
 
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;
 
-    @Schema(description = "订单总额")
+    @Schema(description = "其它费用")
     private BigDecimal otherMoney;
 
-    @Schema(description = "订单总额")
+    @Schema(description = "其它费用说明")
     private String otherRemark;
 }

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

@@ -19,7 +19,7 @@ public class TradeVistorReqVO {
     private String nationality;
 
     @Schema(description = "性别")
-    private Integer sex;
+    private Integer gender;
 
     @Schema(description = "证件号")
     private String cardNo;
@@ -34,7 +34,7 @@ public class TradeVistorReqVO {
     private Integer cardType;
 
     @Schema(description = "手机号")
-    private String phone;
+    private String mobile;
 
     @Schema(description = "分销商的明细ID")
     private String otaDetailId;
@@ -62,4 +62,10 @@ public class TradeVistorReqVO {
 
     @Schema(description = "游客类型 0 成人 1儿童")
     private String type;
+
+    @Schema(description = "房间索引ID")
+    private String roomIndexId;
+
+    @Schema(description = "区域", example = "")
+    private String area;
 }

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

@@ -0,0 +1,122 @@
+package com.yc.ship.module.trade.dal.dataobject.order;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单关联房型数据 DO
+ *
+ * @author 管理员
+ */
+@TableName("trade_order_room_model")
+@KeySequence("trade_order_room_model_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderRoomModelBakDO extends TenantBaseDO {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单关联国籍的id
+     */
+    private Long countryId;
+    /**
+     * 房型ID
+     */
+    private Long roomModelId;
+    /**
+     * 房型名称
+     */
+    private String roomModelName;
+    /**
+     * 楼层
+     */
+    private Integer floor;
+    /**
+     * 成人数(占床)
+     */
+    private Integer adultTakeNum;
+    /**
+     * 成人加床数
+     */
+    private Integer adultPlusNum;
+    /**
+     * 成人单间数
+     */
+    private Integer adultAloneNum;
+    /**
+     * 儿童不占床数
+     */
+    private Integer childNonTakeNum;
+    /**
+     * 儿童占床数
+     */
+    private Integer childTakeNum;
+    /**
+     * 儿童加床数
+     */
+    private Integer childPlusNum;
+    /**
+     * 婴儿不占床数
+     */
+    private Integer babyNonTakeNum;
+    /**
+     * 婴儿儿童占床数
+     */
+    private Integer babyTakeNum;
+    /**
+     * 婴儿儿童加床数
+     */
+    private Integer babyPlusNum;
+    /**
+     * 原价
+     */
+    private BigDecimal originalPrice;
+    /**
+     * 折扣
+     */
+    private BigDecimal discount;
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+    /**
+     * 是否半套
+     */
+    private Integer halfSet;
+    /**
+     * 用房数
+     */
+    private Double useRoomNum;
+    /**
+     * 小计
+     */
+    private BigDecimal subTotal;
+    /**
+     * 实收金额
+     */
+    private BigDecimal realMoney;
+
+}

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

@@ -36,11 +36,6 @@ public class TradeOrderRoomModelDO extends TenantBaseDO {
      * 订单号
      */
     private String orderNo;
-
-    /**
-     * 订单关联国籍的id
-     */
-    private Long countryId;
     /**
      * 房型ID
      */
@@ -53,6 +48,37 @@ public class TradeOrderRoomModelDO extends TenantBaseDO {
      * 楼层
      */
     private Integer floor;
+
+    /**
+     * 原价=基准价 * 票价系数
+     */
+    private BigDecimal originalPrice;
+    /**
+     * 折扣
+     */
+    private BigDecimal discount;
+
+    /**
+     * 房价=原价 * 分销商折扣
+     */
+    private BigDecimal unitPrice;
+    /**
+     * 实收金额
+     */
+    private BigDecimal realMoney;
+    /**
+     * 用房数
+     */
+    private Double useRoomNum;
+
+    /**
+     * 国家加价总价
+     */
+    private BigDecimal countryPlusAmount;
+    /**
+     * 国家加价数
+     */
+    private Integer countryPlusNum;
     /**
      * 成人数(占床)
      */
@@ -61,10 +87,6 @@ public class TradeOrderRoomModelDO extends TenantBaseDO {
      * 成人加床数
      */
     private Integer adultPlusNum;
-    /**
-     * 成人单间数
-     */
-    private Integer adultAloneNum;
     /**
      * 儿童不占床数
      */
@@ -82,40 +104,26 @@ public class TradeOrderRoomModelDO extends TenantBaseDO {
      */
     private Integer babyNonTakeNum;
     /**
-     * 婴儿儿童占床数
+     * 婴儿占床数
      */
     private Integer babyTakeNum;
     /**
-     * 婴儿儿童加床数
+     * 婴儿加床数
      */
     private Integer babyPlusNum;
+
     /**
-     * 原价
-     */
-    private BigDecimal originalPrice;
-    /**
-     * 折扣
-     */
-    private BigDecimal discount;
-    /**
-     * 单价
-     */
-    private BigDecimal price;
-    /**
-     * 是否半套
+     * 升楼层单价
      */
-    private Integer halfSet;
+    private BigDecimal floorPrice;
     /**
-     * 用房数
+     * 升楼层数
      */
-    private Double useRoomNum;
+    private Integer floorNum;
     /**
-     * 小计
+     * 唯一标识，用于给游客信息查询用
      */
-    private BigDecimal subTotal;
-    /**
-     * 实收金额
-     */
-    private BigDecimal realMoney;
+    private String roomIndexId;
+
 
 }

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

@@ -147,4 +147,12 @@ public class TradeVisitorDO extends TenantBaseDO {
     @Schema(description = "产品类型 0 游船产品 1 附加产品 2：赠票", example = "")
     @TableField(exist = false)
     private Integer productType;
+
+    /**
+     * 订单房型的唯一ID，查询入住房型的信息
+     */
+    private String roomIndexId;
+
+    @Schema(description = "区域", example = "")
+    private String area;
 }

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

@@ -510,7 +510,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setGroupNo(orderCreateReqDTO.getGroupNo());
         tradeOrderDO.setVoyageId(orderCreateReqDTO.getVoyageId());
         tradeOrderDO.setShipId(orderCreateReqDTO.getShipId());
-        tradeOrderDO.setDiscountId(orderCreateReqDTO.getDicountId());
+        tradeOrderDO.setDiscountId(orderCreateReqDTO.getDiscountId());
         tradeOrderDO.setCurrency(orderCreateReqDTO.getCurrency());
         tradeOrderDO.setLinkMan(orderCreateReqDTO.getLinkMan());
         tradeOrderDO.setLinkMobile(orderCreateReqDTO.getLinkMobile());
@@ -679,6 +679,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeVisitorDO.setBirthday(visitor.getBirthday());
                 tradeVisitorDO.setGender(visitor.getGender());
                 tradeVisitorDO.setRemark(visitor.getRemark());
+                tradeVisitorDO.setRoomIndexId(visitor.getRoomIndexId());
                 tradeVisitorDO.setDeleted(false);
                 tradeVisitorDO.setNationality(visitor.getNationality());
                 if (orderDetail.getProductType() == 0) {

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

@@ -78,15 +78,14 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
 
     @Override
     public CommonResult<OtcTradeOrderCreateRespVO> miniAppCreateOrder(LoginUser loginUser, MiniTradeOrderCreateReqVO createVO) {
-        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setConfirmType(0);
         shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
         shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
-        shipTradeOrderCreateReqVO.setRealMoney(createVO.getSummary().getRealMoney());
+        shipTradeOrderCreateReqVO.setRealMoney(createVO.getSummary().getRealAmount());
         shipTradeOrderCreateReqVO.setOtherMoney(createVO.getSummary().getOtherMoney());
-        shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
+        shipTradeOrderCreateReqVO.setDiscountId(createVO.getSummary().getDiscountId());
         if (createVO.getSummary().getRealOrderMoney() != null) {
             shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
         }
@@ -145,7 +144,8 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
                     TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
                     ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
                     visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setMobile(tradeVistorReqVO.getPhone());
+                    visitor.setMobile(tradeVistorReqVO.getMobile());
+                    visitor.setGender(tradeVistorReqVO.getGender());
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
@@ -153,6 +153,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
                     visitorList1.add(visitor);
                     spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
                 }
@@ -164,7 +165,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
                 for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                     ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
                     visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setMobile(tradeVistorReqVO.getPhone());
+                    visitor.setMobile(tradeVistorReqVO.getMobile());
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
@@ -172,6 +173,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
                     visitorList1.add(visitor);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -214,40 +216,15 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
 
         //创建订单国籍数据
         List<TradeOrderRoomModelDO> list = new ArrayList<>();
-        List<TradeOrderCountryDO> tradeOrderCountryDOList = new ArrayList<>();
-        List<TradeOrderFloorDO> floorPlus = new ArrayList<>();
-        countryData.forEach(item -> {
-            TradeOrderCountryDO countryDO = BeanUtils.toBean(item, TradeOrderCountryDO.class);
-            Long countryId = IdWorker.getId();
-            countryDO.setOrderId(orderId);
-            countryDO.setId(countryId);
-            tradeOrderCountryDOList.add(countryDO);
-            List<TradeOrderRoomModelReqVO> roomModels = item.getRoomModels();
-            //创建订单房型数据
-            roomModels.forEach(roomModel -> {
-                TradeOrderRoomModelDO roomModelDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
-                Long roomModelId = IdWorker.getId();
-                roomModelDO.setOrderId(orderId);
-                roomModelDO.setId(roomModelId);
-                roomModelDO.setCountryId(countryId);
-                list.add(roomModelDO);
-                // 房型升楼层数据
-                List<TradeOrderFloorReqVO> floorReqVOList = roomModel.getFloorPlus();
-                if (floorReqVOList == null) {
-                    return;
-                }
-                floorReqVOList.forEach(floor -> {
-                    TradeOrderFloorDO floorDO = BeanUtils.toBean(floor, TradeOrderFloorDO.class);
-                    floorDO.setOrderId(orderId);
-                    floorDO.setRoomModelId(roomModelId);
-                    floorPlus.add(floorDO);
-                });
-
-            });
+        // 创建订单房型数据
+        List<TradeOrderRoomModelDO> tradeOrderRoomDOList = new ArrayList<>();
+        List<TradeOrderRoomModelVO> roomModelList = createVO.getRoomModelList();
+        roomModelList.stream().forEach(roomModel -> {
+            TradeOrderRoomModelDO tradeOrderRoomDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
+            tradeOrderRoomDO.setOrderId(orderId);
+            tradeOrderRoomDOList.add(tradeOrderRoomDO);
         });
-        tradeOrderCountryMapper.insertBatch(tradeOrderCountryDOList);
         tradeOrderRoomModelMapper.insertBatch(list);
-        tradeOrderFloorMapper.insertBatch(floorPlus);
 
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
         return CommonResult.success(respVO);
@@ -272,13 +249,14 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
     private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor1(TradeVistorReqVO tradeVistorReqVO) {
         ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
         visitor.setName(tradeVistorReqVO.getName());
-        visitor.setMobile(tradeVistorReqVO.getPhone());
+        visitor.setMobile(tradeVistorReqVO.getMobile());
         visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
         visitor.setCredentialType(tradeVistorReqVO.getCardType());
         visitor.setYczz(tradeVistorReqVO.getYichang());
         visitor.setCqzz(tradeVistorReqVO.getChongqing());
         visitor.setRoomId(tradeVistorReqVO.getRoomId());
         visitor.setNationality(tradeVistorReqVO.getNationality());
+        visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
         return visitor;
     }
 

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

@@ -1840,31 +1840,37 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (ship.getCode() == null) {
             orderNo = date + "-" + voyage.getCode() + "-" + (maxOrderNo + 1);
         }
-        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
+//        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
+        TradeOrderTotalVO summary = createVO.getSummary();
+        BigDecimal realAmount = summary.getRealAmount();
+        BigDecimal orderMoney = summary.getOrderMoney();
+        Long discountId = summary.getDiscountId();
+        BigDecimal realOrderMoney = summary.getRealOrderMoney();
+        BigDecimal otherMoney = summary.getOtherMoney();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getRealAmount())) {
-            shipTradeOrderCreateReqVO.setAmount(createVO.getRealAmount());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getRealAmount());
+        if (orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) {
+            shipTradeOrderCreateReqVO.setAmount(realAmount);
+            shipTradeOrderCreateReqVO.setPayAmount(realAmount);
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
             tradeOrderBindDO.setType(1);
             tradeOrderBindDO.setCustom(createVO.getSummary().getOrderMoney().toString());
-            tradeOrderBindDO.setRemark("create订单金额修改，订单金额：" + createVO.getSummary().getOrderMoney() + "，订单修改后金额：" + createVO.getRealAmount());
+            tradeOrderBindDO.setRemark("create订单金额修改，订单金额：" + orderMoney + "，订单修改后金额：" + realAmount);
             shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         } else {
             shipTradeOrderCreateReqVO.setConfirmType(0);
-            shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
+            shipTradeOrderCreateReqVO.setAmount(orderMoney);
+            shipTradeOrderCreateReqVO.setPayAmount(orderMoney);
         }
-        shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
-        if (createVO.getSummary().getRealOrderMoney() != null) {
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
+        shipTradeOrderCreateReqVO.setDiscountId(discountId);
+        if (realOrderMoney != null) {
+            shipTradeOrderCreateReqVO.setPayAmount(realOrderMoney);
         }
-        shipTradeOrderCreateReqVO.setRealMoney(createVO.getSummary().getRealMoney());
-        shipTradeOrderCreateReqVO.setOtherMoney(createVO.getSummary().getOtherMoney());
+        shipTradeOrderCreateReqVO.setRealMoney(realAmount);
+        shipTradeOrderCreateReqVO.setOtherMoney(otherMoney);
 
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
         orderUser.setContactName(createVO.getLinkMan());
@@ -1939,11 +1945,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
                     ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
                     visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setMobile(tradeVistorReqVO.getPhone());
+                    visitor.setMobile(tradeVistorReqVO.getMobile());
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
                     visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                    visitor.setGender(tradeVistorReqVO.getSex());
+                    visitor.setGender(tradeVistorReqVO.getGender());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
@@ -1951,6 +1957,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
                     visitor.setType(tradeVistorReqVO.getType());
                     visitor.setAge(tradeVistorReqVO.getAge());
+                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
                     visitorList1.add(visitor);
                     spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
                 }
@@ -1962,18 +1969,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                     ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
                     visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setMobile(tradeVistorReqVO.getPhone());
+                    visitor.setMobile(tradeVistorReqVO.getMobile());
                     visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
                     visitor.setCredentialType(tradeVistorReqVO.getCardType());
                     visitor.setYczz(tradeVistorReqVO.getYichang());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                    visitor.setGender(tradeVistorReqVO.getSex());
+                    visitor.setGender(tradeVistorReqVO.getGender());
                     visitor.setBirthday(tradeVistorReqVO.getBirthday());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
                     visitor.setType(tradeVistorReqVO.getType());
                     visitor.setAge(tradeVistorReqVO.getAge());
+                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
                     visitorList1.add(visitor);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -2022,62 +2030,35 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (result.isError()) {
             return CommonResult.error(result);
         }
-        TradeOrderTotalVO summary = createVO.getSummary();
         TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
         Long orderId = result.getCheckedData().getOrderId();
         tradeOrderTotalDO.setOrderId(IdWorker.getId());
         tradeOrderTotalDO.setOldOrderId(orderId);
-        tradeOrderTotalDO.setOtherRemark(createVO.getOtherRemark());
-        tradeOrderTotalDO.setRealMoney(createVO.getRealAmount());
-        tradeOrderTotalDO.setOtherMoney(createVO.getOtherAmount());
+        tradeOrderTotalDO.setOtherRemark(summary.getOtherRemark());
+//        tradeOrderTotalDO.setRealMoney(createVO.getRealAmount());
+//        tradeOrderTotalDO.setOtherMoney(createVO.getOtherAmount());
         tradeOrderTotalMapper.insert(tradeOrderTotalDO);
 
-        //创建订单国籍数据 //创建订单房型数据
-        List<TradeOrderRoomModelDO> list = new ArrayList<>();
-        int auditType = 0;
-        //创建订单国籍数据
-        List<TradeOrderCountryDO> tradeOrderCountryDOList = new ArrayList<>();
-        List<TradeOrderFloorDO> floorPlus = new ArrayList<>();
-        for (TradeOrderCountryReqVO item : countryData) {
-            TradeOrderCountryDO countryDO = BeanUtils.toBean(item, TradeOrderCountryDO.class);
-            if (countryDO.getLeaderPrice() !=null &&countryDO.getLeaderPrice().compareTo(BigDecimal.ZERO)!=0) {
-                auditType = 3;
-            }
-            Long countryId = IdWorker.getId();
-            countryDO.setOrderId(orderId);
-            countryDO.setId(countryId);
-            tradeOrderCountryDOList.add(countryDO);
-            List<TradeOrderRoomModelReqVO> roomModels = item.getRoomModels();
-            //创建订单房型数据
-            roomModels.forEach(roomModel -> {
-                TradeOrderRoomModelDO roomModelDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
-                Long roomModelId = IdWorker.getId();
-                roomModelDO.setOrderId(orderId);
-                roomModelDO.setId(roomModelId);
-                roomModelDO.setCountryId(countryId);
-                list.add(roomModelDO);
-                // 房型升楼层数据
-                List<TradeOrderFloorReqVO> floorReqVOList = roomModel.getFloorPlus();
-                if (floorReqVOList == null) {
-                    return;
-                }
-                floorReqVOList.forEach(floor -> {
-                    TradeOrderFloorDO floorDO = BeanUtils.toBean(floor, TradeOrderFloorDO.class);
-                    floorDO.setOrderId(orderId);
-                    floorDO.setRoomModelId(roomModelId);
-                    floorPlus.add(floorDO);
-                });
+        // 创建订单房型数据
+        List<TradeOrderRoomModelDO> tradeOrderRoomDOList = new ArrayList<>();
+        List<TradeOrderRoomModelVO> roomModelList = createVO.getRoomModelList();
+        roomModelList.stream().forEach(roomModel -> {
+            TradeOrderRoomModelDO tradeOrderRoomDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
+            tradeOrderRoomDO.setOrderId(orderId);
+            tradeOrderRoomDOList.add(tradeOrderRoomDO);
+        });
 
-            });
+        int auditType = 0;
+        BigDecimal leaderTotalMoney = summary.getLeaderTotalMoney();
+        if(leaderTotalMoney != null && leaderTotalMoney.compareTo(new BigDecimal(0)) > 0)  {
+            auditType = 3;
         }
-
         if(auditType>0 && createVO.getIsYd()!=1){
             tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER).set("audit_status", 1).eq("id", orderId));
         }
-        tradeOrderCountryMapper.insertBatch(tradeOrderCountryDOList);
-        tradeOrderRoomModelMapper.insertBatch(list);
-        tradeOrderFloorMapper.insertBatch(floorPlus);
-
+        if(tradeOrderRoomDOList.size()>0) {
+            tradeOrderRoomModelMapper.insertBatch(tradeOrderRoomDOList);
+        }
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
         return CommonResult.success(respVO);
 
@@ -2086,17 +2067,18 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor1(TradeVistorReqVO tradeVistorReqVO) {
         ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
         visitor.setName(tradeVistorReqVO.getName());
-        visitor.setMobile(tradeVistorReqVO.getPhone());
+        visitor.setMobile(tradeVistorReqVO.getMobile());
         visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
         visitor.setCredentialType(tradeVistorReqVO.getCardType());
         visitor.setYczz(tradeVistorReqVO.getYichang());
         visitor.setCqzz(tradeVistorReqVO.getChongqing());
         visitor.setRoomId(tradeVistorReqVO.getRoomId());
         visitor.setNationality(tradeVistorReqVO.getNationality());
-        visitor.setGender(tradeVistorReqVO.getSex());
+        visitor.setGender(tradeVistorReqVO.getGender());
         visitor.setBirthday(tradeVistorReqVO.getBirthday());
         visitor.setType(tradeVistorReqVO.getType());
         visitor.setAge(tradeVistorReqVO.getAge());
+        visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
         return visitor;
     }
 
@@ -2127,22 +2109,28 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         int auditType = 0;
         String orderNo = tradeOrderDO.getOrderNo();
         Date updateTime = new Date();
-        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
+//        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setTravelDate(tradeOrderDO.getTravelDate());
         shipTradeOrderCreateReqVO.setOrderId(orderId);
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getRealAmount())) {
-            shipTradeOrderCreateReqVO.setAmount(createVO.getRealAmount());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getRealAmount());
+        TradeOrderTotalVO summary = createVO.getSummary();
+        BigDecimal realAmount = summary.getRealAmount();
+        BigDecimal orderMoney = summary.getOrderMoney();
+        Long discountId = summary.getDiscountId();
+        BigDecimal realOrderMoney = summary.getRealOrderMoney();
+        BigDecimal otherMoney = summary.getOtherMoney();
+        if (orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) {
+            shipTradeOrderCreateReqVO.setAmount(realAmount);
+            shipTradeOrderCreateReqVO.setPayAmount(orderMoney);
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
             tradeOrderBindDO.setType(1);
             tradeOrderBindDO.setBindId(orderId);
             tradeOrderBindDO.setCustom("");
-            tradeOrderBindDO.setRemark("modify订单金额修改，订单金额：" + createVO.getSummary().getOrderMoney() + "，订单修改后金额：" + createVO.getRealAmount());
+            tradeOrderBindDO.setRemark("modify订单金额修改，订单金额：" + orderMoney + "，订单修改后金额：" + realAmount);
             shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         } else {
             shipTradeOrderCreateReqVO.setConfirmType(0);
@@ -2153,7 +2141,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setConfirmType(1);
         }
 
-        shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
+        shipTradeOrderCreateReqVO.setDiscountId(discountId);
         if (createVO.getSummary().getRealOrderMoney() != null) {
             shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
         }
@@ -2188,7 +2176,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
             ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
             visitor.setName(tradeVistorReqVO.getName());
-            visitor.setMobile(tradeVistorReqVO.getPhone());
+            visitor.setMobile(tradeVistorReqVO.getMobile());
             visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
             visitor.setCredentialType(tradeVistorReqVO.getCardType());
             visitor.setYczz(tradeVistorReqVO.getYichang());
@@ -2196,10 +2184,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setRoomId(tradeVistorReqVO.getRoomId());
             visitor.setAge(tradeVistorReqVO.getAge());
             visitor.setBirthday(tradeVistorReqVO.getBirthday());
-            visitor.setGender(tradeVistorReqVO.getSex());
+            visitor.setGender(tradeVistorReqVO.getGender());
             visitor.setNationality(tradeVistorReqVO.getNationality());
             visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
             visitor.setType(tradeVistorReqVO.getType());
+            visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);
@@ -2231,18 +2220,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                     ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
                     visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setMobile(tradeVistorReqVO.getPhone());
+                    visitor.setMobile(tradeVistorReqVO.getMobile());
                     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.setGender(tradeVistorReqVO.getGender());
                     visitor.setCqzz(tradeVistorReqVO.getChongqing());
                     visitor.setNationality(tradeVistorReqVO.getNationality());
                     visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
                     visitor.setRoomId(tradeVistorReqVO.getRoomId());
                     visitor.setType(tradeVistorReqVO.getType());
+                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
                     visitorList1.add(visitor);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -2294,7 +2284,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             return CommonResult.error(result);
         }
         Long neworderId = result.getCheckedData().getOrderId();
-        TradeOrderTotalVO summary = createVO.getSummary();
         TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
         tradeOrderTotalMapper.update(new LambdaUpdateWrapper<TradeOrderTotalDO>()
                 .set(TradeOrderTotalDO::getDeleted, 1)
@@ -2304,61 +2293,23 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         );
         tradeOrderTotalDO.setOrderId(IdWorker.getId());
         tradeOrderTotalDO.setOldOrderId(neworderId);
-        tradeOrderTotalDO.setOtherRemark(createVO.getOtherRemark());
-        tradeOrderTotalDO.setRealMoney(createVO.getRealAmount());
-        tradeOrderTotalDO.setOtherMoney(createVO.getOtherAmount());
         tradeOrderTotalMapper.insert(tradeOrderTotalDO);
 
         //创建订单房型数据
         List<TradeOrderRoomModelDO> list = new ArrayList<>();
-        //创建订单国籍数据
-        List<TradeOrderCountryDO> tradeOrderCountryDOList = new ArrayList<>();
-        List<TradeOrderFloorDO> floorPlus = new ArrayList<>();
-        countryData.forEach(item -> {
-            TradeOrderCountryDO countryDO = BeanUtils.toBean(item, TradeOrderCountryDO.class);
-            Long countryId = IdWorker.getId();
-            countryDO.setOrderId(neworderId);
-            countryDO.setId(countryId);
-            tradeOrderCountryDOList.add(countryDO);
-            List<TradeOrderRoomModelReqVO> roomModels = item.getRoomModels();
-            //创建订单房型数据
-            roomModels.forEach(roomModel -> {
-                TradeOrderRoomModelDO roomModelDO = BeanUtils.toBean(roomModel, TradeOrderRoomModelDO.class);
-                Long roomModelId = IdWorker.getId();
-                roomModelDO.setOrderId(neworderId);
-                roomModelDO.setId(roomModelId);
-                roomModelDO.setCountryId(countryId);
-                list.add(roomModelDO);
-                // 房型升楼层数据
-                List<TradeOrderFloorReqVO> floorReqVOList = roomModel.getFloorPlus();
-                if (floorReqVOList == null) {
-                    return;
-                }
-                floorReqVOList.forEach(floor -> {
-                    TradeOrderFloorDO floorDO = BeanUtils.toBean(floor, TradeOrderFloorDO.class);
-                    floorDO.setOrderId(neworderId);
-                    floorDO.setRoomModelId(roomModelId);
-                    floorPlus.add(floorDO);
-                });
-
-            });
+        List<TradeOrderRoomModelVO> roomModelList = createVO.getRoomModelList();
+        roomModelList.stream().forEach(item -> {
+            TradeOrderRoomModelDO tradeOrderRoomModelDO = BeanUtils.toBean(item, TradeOrderRoomModelDO.class);
+            tradeOrderRoomModelDO.setOrderId(IdWorker.getId());
+            list.add(tradeOrderRoomModelDO);
         });
 
-        tradeOrderCountryMapper.update(new LambdaUpdateWrapper<TradeOrderCountryDO>()
-                .set(TradeOrderCountryDO::getDeleted, 1)
-                .set(TradeOrderCountryDO::getUpdateTime, updateTime)
-                .eq(TradeOrderCountryDO::getOrderId, orderId)
-        );
         tradeOrderRoomModelMapper.update(new LambdaUpdateWrapper<TradeOrderRoomModelDO>()
                 .set(TradeOrderRoomModelDO::getDeleted, 1)
                 .set(TradeOrderRoomModelDO::getUpdateTime, updateTime)
                 .eq(TradeOrderRoomModelDO::getOrderId, orderId)
         );
-        tradeOrderFloorMapper.update(new LambdaUpdateWrapper<TradeOrderFloorDO>()
-                .set(TradeOrderFloorDO::getDeleted, 1)
-                .set(TradeOrderFloorDO::getUpdateTime, updateTime)
-                .eq(TradeOrderFloorDO::getOrderId, orderId)
-        );
+
         if(!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId()!=null){
             auditType = 4;
         }
@@ -2369,9 +2320,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
         }
 
-        tradeOrderCountryMapper.insertBatch(tradeOrderCountryDOList);
         tradeOrderRoomModelMapper.insertBatch(list);
-        tradeOrderFloorMapper.insertBatch(floorPlus);
 
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
         return CommonResult.success(respVO);
@@ -2381,11 +2330,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     private static ShipTradeOrderCreateReqVO.@NotNull Visitor getVisitor(TradeVistorReqVO tradeVistorReqVO) {
         ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
         visitor.setName(tradeVistorReqVO.getName());
-        visitor.setMobile(tradeVistorReqVO.getPhone());
+        visitor.setMobile(tradeVistorReqVO.getMobile());
         visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
         visitor.setCredentialType(tradeVistorReqVO.getCardType());
         visitor.setYczz(tradeVistorReqVO.getYichang());
         visitor.setCqzz(tradeVistorReqVO.getChongqing());
+        visitor.setAge(tradeVistorReqVO.getAge());
+        visitor.setBirthday(tradeVistorReqVO.getBirthday());
+        visitor.setGender(tradeVistorReqVO.getGender());
+        visitor.setNationality(tradeVistorReqVO.getNationality());
+        visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+        visitor.setRoomId(tradeVistorReqVO.getRoomId());
+        visitor.setType(tradeVistorReqVO.getType());
+        visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
         return visitor;
     }