Skip to content

T
travel-cloud
提交 116e5625 authored 作者: hzh's avatar hzh
浏览文件
操作

国内机票模块接口全部对接

上级 91af3aa6
隐藏空白字符变更
内嵌 并排
正在显示 包含 2397 行增加 和 12 行删除
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java
浏览文件 @ 116e5625
......@@ -33,30 +33,35 @@ public class BaseEntity implements Serializable {
/**
* 创建部门
*/
@JsonIgnore
@TableField(fill = FieldFill.INSERT)
private Long createDept;
/**
* 创建者
*/
@JsonIgnore
@TableField(fill = FieldFill.INSERT)
private Long createBy;
/**
* 创建时间
*/
@JsonIgnore
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
* 更新者
*/
@JsonIgnore
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateBy;
/**
* 更新时间
*/
@JsonIgnore
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/enums/airport/AirportApiEnum.java
浏览文件 @ 116e5625
......@@ -70,10 +70,6 @@ public enum AirportApiEnum implements ApiEnum {
* 确认出票
*/
CONFIRM_TICKET("/open/plane/order/confirmTicket", "机票订单确认出票；调用此接口，会自动扣款（或欠款记账）并出票。前提是企业必须开通预存或月结欠款支付，否则会提示账户问题导致出票不成功。"),
/**
* 机票支付
*/
PAY_ORDER("/open/plane/order/payOrder", "机票支付"),
/**
* 取消订单
*/
......@@ -86,6 +82,10 @@ public enum AirportApiEnum implements ApiEnum {
* 根据票号获取客票状态
*/
GET_TICKET_STATUS("/open/plane/order/getTicketStatus", "根据票号获取客票状态"),
/**
* 机票支付
*/
PAY_ORDER("/open/plane/order/payOrder", "机票支付"),
/**
* 获取可退航段
*/
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/AddChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class AddChangeOrderModel extends BaseModel {
/**
* 改签原因代码，数据来源于基础数据接口，默认自愿改签
**/
private String changeReasonCode;
/**
* 订单编号
**/
private String orderNo;
/**
* 改签原因，数据来源于基础数据接口，默认自愿改签
**/
private String changeReason;
/**
* 航段集合
**/
private List<AddChangeOrderRangeBean> ranges;
/**
* 改签类别，1改期 2升舱
**/
private Integer alterType;
/**
* 改签类型，1自愿 2非自愿
**/
private String changeType;
/**
* 改签乘机人顺序号，用逗号隔开
**/
private String psgSns;
/**
* 企业改签原因
**/
private String changeReasonVip;
/**
* 改签证明图片地址
**/
private String changeProveUrl;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/AddChangeOrderRangeBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class AddChangeOrderRangeBean {
/**
*
**/
private String nstopDepartTime;
/**
* 航段顺序号
**/
private Integer rangeSn;
/**
*
**/
private String nflightNo;
/**
*
**/
private String nstopArriveTime;
/**
*
**/
private String ndepartTime;
/**
* 价格id，查询时返回
**/
private String priceId;
/**
*
**/
private String ncabin;
/**
*
**/
private String nshareFlightNo;
/**
*
**/
private String nstopAirport;
/**
* 航班标识，查询时返回
**/
private String cacheId;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/CancelChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CancelChangeOrderModel extends BaseModel {
/**
* 改签订单编号
**/
private String changeNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/CheckCabinModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckCabinModel extends BaseModel {
/**
* 航班号 不能为空
**/
private String flightNo;
/**
* 起飞日期 不能为空
**/
private String flightDate;
/**
* 出发机场三字码
**/
private String deptAirportCode;
/**
* 到达机场三字码
**/
private String arrAirportCode;
/**
* 舱位代码 不能为空
**/
private List<String> cabinList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/CheckPriceForFlightModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckPriceForFlightModel extends BaseModel {
/**
* 差旅类型，1：因公 2：因私
**/
private String tripType;
/**
* 航班号，查询航班时返回
**/
private String flightNo;
/**
* 舱位代码，查询航班时返回
**/
private String cabin;
/**
* 价格标识，查询航班时返回
**/
private String priceId;
/**
* 航班标识，查询航班时返回
**/
private String cacheId;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/CheckXyhBmdModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckXyhBmdModel extends BaseModel {
/**
* 乘机人集合
**/
private List<CheckXyhBmdPsgApiBean> psgList;
/**
* 协议号
**/
private String threeProtocol;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/CheckXyhBmdPsgApiBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckXyhBmdPsgApiBean extends BaseModel {
/**
* 乘机人姓名
**/
private String psgName;
/**
* 证件号码
**/
private String idNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/DispatchChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class DispatchChangeOrderModel extends BaseModel {
/**
* 是否直接自动支付 1是 0否
**/
private Integer autoPay;
/**
* 订单编号不能为空
**/
private String orderNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/GetTicketStatusModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class GetTicketStatusModel extends BaseModel {
/**
* 票号 14位 eg:781-1234567891
**/
private String tkno;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/GetVoyageForChangeModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class GetVoyageForChangeModel extends BaseModel {
/**
* 订单编号
**/
private String orderNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/MatchClbzModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class MatchClbzModel extends BaseModel {
/**
* 去程航班号，查询航班时返回
**/
private String qflightNo;
/**
* 回程航班号，查询航班时返回
**/
private String hflightNo;
/**
* 回程航班标识，查询航班时返回
**/
private String hcacheId;
/**
* 用于匹配差标的员工工号，如不传，以当前登录人工号进行匹配
**/
private String empNo;
/**
* 去程航班标识，查询航班时返回
**/
private String qcacheId;
/**
* 去程价格标识，查询航班时返回
**/
private String qpriceId;
/**
* 回程价格标识，查询航班时返回
**/
private String hpriceId;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/PlaneCheckStateModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class PlaneCheckStateModel extends BaseModel {
/**
* 订单类型
**/
private String orderType;
/**
* 业务单号（正常单：机票票号，改签单：改签单ID）
**/
private String tkYwdh;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/PlaneOrderQueryChangeOrderApiModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class PlaneOrderQueryChangeOrderApiModel extends BaseModel {
/**
* 预订人
**/
private String bookNo;
/**
* 改签订单号
**/
private String changeNo;
/**
* 日期类型 1预定日期 2出行日期 3出票/确认日期
**/
private Integer dateType;
/**
* 订单号
**/
private String orderNo;
/**
* 时间始 格式：yyyy-MM-dd
**/
private String dateStart;
/**
* 每页显示条数，不能小于10
**/
private Integer count;
/**
* 出差申请单号
**/
private String travelNo;
/**
* 时间止 格式：yyyy-MM-dd
**/
private String dateEnd;
/**
* 公司支付限制 1只查询公司支付订单 0或空不限制
**/
private Integer payCompanyFlag;
/**
* 当前页数，不能小于1
**/
private Integer pageNum;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/QueryChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryChangeOrderModel extends BaseModel {
/**
* 改签订单编号，原订单编号、改签订单编号不能同时为空
**/
private String changeNo;
/**
* 原订单编号，原订单编号、改签订单编号不能同时为空
**/
private String orderNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/QueryFlightForChangeModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryFlightForChangeModel extends BaseModel {
/**
* 出发机场三字码，请参考机场静态数据
**/
private String departAirport;
/**
* 到达机场三字码，请参考机场静态数据
**/
private String arriveAirport;
/**
* 改签航段顺序号 升舱时必传
**/
private String rangeSn;
/**
* 原销售价
**/
private BigDecimal oldXsj;
/**
* 订单编号
**/
private String orderNo;
/**
* 原舱位销售折扣
**/
private BigDecimal oldCabinDisCount;
/**
* 原舱位代码
**/
private String oldCabin;
/**
* 起飞日期，格式：yyyy-MM-dd
**/
private String departDate;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/QueryFlightRuleModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryFlightRuleModel extends BaseModel {
/**
* 销售价
**/
private BigDecimal salePrice;
/**
* 舱位代码，航班查询有返回
**/
private String cabin;
/**
* 出发日期
**/
private String departDate;
/**
* 航司二字码，航班查询有返回
**/
private String airline;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/AddChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class AddChangeOrderModel {
/**
* 退票订单编号集合
**/
private List<String> changeNoList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/CheckCabinModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.req.CheckCabinBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckCabinModel {
/**
* 验舱信息
**/
private List<CheckCabinBean> cabinInfoList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/CheckPriceForFlightModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckPriceForFlightModel {
/**
* 机建
**/
private BigDecimal airportFee;
/**
* 服务费
**/
private BigDecimal serviceFee;
/**
* 婴儿服务费
**/
private BigDecimal serviceFeeInf;
/**
* 票面价
**/
private BigDecimal salePrice;
/**
* 婴儿税费
**/
private BigDecimal taxInf;
/**
* 婴儿机建
**/
private BigDecimal airportFeeInf;
/**
* 税费
**/
private BigDecimal tax;
/**
* 销售折扣，格式：8.5 代表8.5折
**/
private BigDecimal saleDiscount;
/**
* 婴儿票面价
**/
private BigDecimal salePriceInf;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/CheckXyhBmdModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.req.airport.CheckXyhBmdPsgApiBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckXyhBmdModel {
/**
* 验证结果 0全部验证通过 1验证不通过
**/
private String flag;
/**
* 不通过乘机人集合
**/
private List<CheckXyhBmdPsgApiBean> psgList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/GetTicketStatusModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.GetTicketStatusRangeBean;
import java.math.BigDecimal;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class GetTicketStatusModel extends BaseModel {
/**
* 票面价 不包含机建税费
**/
private BigDecimal fare;
/**
* EI项 对应E/R项
**/
private String ei;
/**
* 乘机人 对应PASSENGER项
**/
private String psgName;
/**
* 机场建设费，对应税费项中的CN
**/
private BigDecimal tax;
/**
* 14位票号
**/
private String tkno;
/**
* UATP卡号 FOP项中包含
**/
private String uatpKh;
/**
* 总价格 包含机建税费
**/
private BigDecimal total;
/**
* 航程集合
**/
private List<GetTicketStatusRangeBean> rangeList;
/**
* GP票标识 0否 1是 默认0
**/
private Integer ifGp;
/**
* 协议号
**/
private String protocolNo;
/**
* 燃油附加费，对应税费项中的YQ
**/
private BigDecimal yq;
/**
* 首张票标识 0否 1是 默认1 eg:781-9999999998/99 98返回1 99返回0
**/
private Integer ifFirst;
/**
* UATP有效期 FOP项中包含
**/
private String uatpYxq;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/GetVoyageForChangeModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.TkOrderPsgChangeBean;
import org.dromara.common.ys.model.res.airport.other.TkOrderRangeChangeBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class GetVoyageForChangeModel extends BaseModel {
/**
* 乘机人集合
**/
private List<TkOrderPsgChangeBean> psgBeanList;
/**
* 航段集合
**/
private List<TkOrderRangeChangeBean> rangeBeanList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/MatchClbzModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class MatchClbzModel {
/**
* 去程违背原因代码
**/
private String qviolateCode;
/**
* 回程是否可以预定 0否 1是
**/
private String hcanBook;
/**
* 去程是否可以预定 0否 1是
**/
private String qcanBook;
/**
* 回程违背原因代码
**/
private String hviolateCode;
/**
* 去程违背事项
**/
private String qviolateItem;
/**
* 回程违背事项
**/
private String hviolateItem;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/PlaneCheckStateModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.TkCheckStateInfoBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class PlaneCheckStateModel extends BaseModel {
/**
* 机票票号集合
**/
private List<TkCheckStateInfoBean> tkCheckStateList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/PlaneOrderQueryChangeOrderApiBeanModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class PlaneOrderQueryChangeOrderApiBeanModel {
/**
* 预定时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String bookDate;
/**
* 原订单号
**/
private String orderNo;
/**
* 乘机人
**/
private String psg;
/**
*
**/
private String ocabinName;
/**
*
**/
private String omodel;
/**
* 改签类型1自愿；2非自愿
**/
private Integer changeType;
/**
*
**/
private String ndepartTime;
/**
* 订单状态0已申请1已确认2已完成5已取消
**/
private String orderStatus;
/**
*
**/
private String nvoyageAirportZhn;
/**
* 预订人名称
**/
private String bookerName;
/**
* 航程中文
**/
private String voyageZh;
/**
*
**/
private String oflightNo;
/**
*
**/
private String ovoyageAirportZh;
/**
* 改签单号
**/
private String changeNo;
/**
* 订单状态名称
**/
private String orderStatusName;
/**
* 订单总金额
**/
private BigDecimal totalAmount;
/**
*
**/
private String nmodel;
/**
* 差旅类型 1因公 2因私
**/
private Integer tripType;
/**
* 预定人工号
**/
private String bookerNo;
/**
*
**/
private String nflightNo;
/**
* 改签类别1改期2升舱
**/
private Integer alterType;
/**
*
**/
private String ncabinName;
/**
*
**/
private String odepartTime;
/**
* 出票时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String drawDate;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/QueryChangeOrderModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.TkChangeOrderInfoBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryChangeOrderModel extends BaseModel {
/**
* 改签机票订单集合
**/
private List<TkChangeOrderInfoBean> changeOrderList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/QueryFlightForChangeModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.DayMinPriceVoBean;
import org.dromara.common.ys.model.res.airport.other.DayPriceVoBean;
import java.util.List;
import java.util.Map;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryFlightForChangeModel extends BaseModel {
/**
* 查询耗时（毫秒）
**/
private String queryTimes;
/**
* 机型map，参考航班查询返回机型集合
**/
private Map<String, Object> planeMap;
/**
* 航班集合，参考航班查询返回航班集合
**/
private Map<String, Object> flightMap;
/**
* 价格map集合，参考航班查询返回价格集合
**/
private Map<String, Object> priceMap;
/**
* 七天特价，参考航班查询返回七天特价数据
**/
private List<DayPriceVoBean> weekPrice;
/**
* 全天最低价，参考航班查询返回全天最低价数据
**/
private DayMinPriceVoBean dayMinPrice;
/**
* 航班缓存id
**/
private String cacheId;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/QueryFlightRuleModel.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import org.dromara.common.ys.model.res.airport.other.FlightRuleBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class QueryFlightRuleModel extends BaseModel {
/**
* 行李额，格式20K
**/
private String baggageWeight;
/**
* 退改签规则集合
**/
private List<FlightRuleBean> ruleList;
/**
* 行李说明
**/
private String xlgd;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/ChangeStopInfoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ChangeStopInfoBean {
/**
*
**/
private String nstopDepartTime;
/**
*
**/
private String nstopAirportName;
/**
*
**/
private String ostopCityName;
/**
*
**/
private String nstopCityName;
/**
*
**/
private String ostopCity;
/**
*
**/
private String nstopArriveTime;
/**
*
**/
private String ostopArriveTime;
/**
*
**/
private String ostopAirport;
/**
*
**/
private String ostopAirportName;
/**
*
**/
private String nstopAirport;
/**
*
**/
private String nstopCity;
/**
*
**/
private String ostopDepartTime;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/CheckCabinBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.req;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class CheckCabinBean {
/**
* 舱位等级
**/
private String cabinLevel;
/**
* 舱位代码
**/
private String cabin;
/**
* 舱位座位数
**/
private String seatCount;
/**
* 舱位名称
**/
private String cabinName;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/ChengeRangeInfoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ChengeRangeInfoBean {
/**
*
**/
private String oarriveAirport;
/**
* 里程
**/
private Integer distance;
/**
* 经停信息
**/
private ChangeStopInfoBean stopInfoBean;
/**
*
**/
private String narriveAirport;
/**
*
**/
private String odepartAirport;
/**
*
**/
private String omodel;
/**
*
**/
private String ndepartTime;
/**
*
**/
private String odepartAirportName;
/**
*
**/
private String narriveAirportName;
/**
*
**/
private String oarriveTime;
/**
*
**/
private String oflightNo;
/**
*
**/
private String ocabin;
/**
*
**/
private String nmodel;
/**
*
**/
private String ndepartCityName;
/**
*
**/
private String oarriveCityName;
/**
*
**/
private String ndepartTerminal;
/**
*
**/
private String ndepartAirport;
/**
* 顺序号
**/
private Integer sn;
/**
*
**/
private String oarriveAirportName;
/**
* 航司二字码
**/
private String airline;
/**
*
**/
private String oarriveTerminalName;
/**
*
**/
private String ocabinName;
/**
*
**/
private String ostopFlag;
/**
*
**/
private String narriveTime;
/**
*
**/
private String nstopFlag;
/**
*
**/
private String ncabin;
/**
*
**/
private String narriveCityName;
/**
*
**/
private String odepartCityName;
/**
*
**/
private String ndepartAirportName;
/**
*
**/
private String nflightNo;
/**
*
**/
private String ncabinName;
/**
*
**/
private String odepartTime;
/**
* 航司名称
**/
private String airlineName;
/**
*
**/
private String narriveTerminal;
/**
*
**/
private String odepartTerminal;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/DayMinPriceVoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class DayMinPriceVoBean {
/**
* 航班号
**/
private String flightNo;
/**
* 账单价
**/
private BigDecimal salePrice;
/**
* 舱位代码
**/
private String cabin;
/**
* 价格id
**/
private String priceId;
/**
* 舱位名称
**/
private String cabinName;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/DayPriceVoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class DayPriceVoBean {
/**
* 日期
**/
private String date;
/**
* 星期
**/
private String week;
/**
* 价格
**/
private BigDecimal price;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/FlightRuleBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class FlightRuleBean {
/**
* 时间起是否包含，1包含 0不包含
**/
private String startFlag;
/**
* 范围标识，1退票 2变更 默认1
**/
private String rangeFlag;
/**
* 时间起，格式：yyyy-MM-dd
**/
private String dateStart;
/**
* 价格
**/
private BigDecimal price;
/**
* 时间止是否包含，1包含 0不包含
**/
private String endFlag;
/**
* 时间止，格式：yyyy-MM-dd
**/
private String dateEnd;
/**
* 百分比 *100后的数据
**/
private BigDecimal value;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/GetTicketStatusRangeBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class GetTicketStatusRangeBean {
/**
* 出发机场三字码 eg:PEK
**/
private String departAirport;
/**
* 出发城市名称
**/
private String departCityName;
/**
* 到达机场三字码 eg:WUH
**/
private String arriveAirport;
/**
* 价格标识代码 eg:Y
**/
private String priceCode;
/**
* 航班号 eg:CZ3210
**/
private String flightNo;
/**
* 出发时间 eg:2021-04-23 10:35
**/
private String departTime;
/**
* 到达机场名称
**/
private String arriveAirportName;
/**
* 舱位代码 eg:Y
**/
private String cabin;
/**
* 出发机场名称
**/
private String departAirportName;
/**
* 票航程状态 eg:OPEN FOR USE
**/
private String rangeStatus;
/**
* 航司二字码 eg:CZ
**/
private String airline;
/**
* 到达城市名称
**/
private String arriveCityName;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkChangeOrderInfoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.BaseModel;
import java.math.BigDecimal;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TkChangeOrderInfoBean extends BaseModel {
/**
*
**/
private String ndepartTime;
/**
*
**/
private String nvoyageAirportZhn;
/**
*
**/
private BigDecimal nfcny;
/**
* 改签单状态名称
**/
private String changeOrderStatusName;
/**
* 申请时间
**/
private String applyDatetime;
/**
* 航程中文
**/
private String voyageZh;
/**
* 乘机人证件号码
**/
private String idNo;
/**
* 支付信息集合 适用于多科目支付
**/
private List<OrderPayInfoBean> payInfoList;
/**
* 国内国际，0国际 1国内
**/
private Integer international;
/**
* 企业改签原因
**/
private String changeReasonVip;
/**
* 改签证明
**/
private String changeProveUrl;
/**
* 改签服务费
**/
private BigDecimal serviceFee;
/**
*
**/
private String ntkno;
/**
* 乘机所在部门名称
**/
private String empDepName;
/**
* 原正常单号
**/
private String orderNo;
/**
* 乘机人证件类型，NI身份证 PP护照 ID其他
**/
private String idType;
/**
*
**/
private String ocabinName;
/**
* 乘机人所在部门编号
**/
private String empDeptNo;
/**
* 差价
**/
private BigDecimal priceDiff;
/**
* 航程三字码
**/
private String voyage;
/**
*
**/
private String otkno;
/**
* 改签航段集合
**/
private List<ChengeRangeInfoBean> orderRangeList;
/**
* 预订渠道
**/
private String orderFrom;
/**
*
**/
private String ncabinName;
/**
*
**/
private String odepartTime;
/**
* 改签办理时间
**/
private String drawDate;
/**
*
**/
private String opnrNo;
/**
* 乘机人
**/
private String psg;
/**
*
**/
private String oflightNo;
/**
*
**/
private String ocabin;
/**
*
**/
private String ovoyageAirportZh;
/**
* 航程类型，1单程 2往返 3连程 4缺口程
**/
private Integer voyageType;
/**
* 改签单状态代码
**/
private String changeOrderStatus;
/**
* 乘机人类型，1成人 2儿童 3婴儿
**/
private Integer psgType;
/**
* 改签合计
**/
private String orderPriceSum;
/**
* 乘机人顺序号
**/
private Integer psgSn;
/**
* 客票状态
**/
private String detrStatus;
/**
* 改签原因
**/
private String changeReason;
/**
* 改签类型，1自愿 2非自愿
**/
private Integer changeType;
/**
*
**/
private String narriveTime;
/**
* 乘机人工号
**/
private String empNo;
/**
* 改签手续费
**/
private BigDecimal cuChangeAmount;
/**
*
**/
private String ncabin;
/**
* 改签单号
**/
private String changeOrderNo;
/**
* 差旅信息
**/
private OrderBusinessInfoBean businessInfo;
/**
*
**/
private String npnrNo;
/**
*
**/
private String nflightNo;
/**
* 改签类别，1改签 2升舱
**/
private Integer alterType;
/**
*
**/
private BigDecimal ofcny;
/**
* 支付状态，0未付 1已付
**/
private Integer payStatus;
/**
* 支付信息 只返回最后一种支付科目的信息
**/
private OrderPayInfoBean payInfo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkCheckStateInfoBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TkCheckStateInfoBean {
/**
* 航信原始客票状态
**/
private String detrStatus;
/**
* 客票单据类型（正常单客票，改签单客票）
**/
private String orderType;
/**
* 客票所属单据单号
**/
private String orderNo;
/**
* 票号
**/
private String tkNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkOrderPsgChangeBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TkOrderPsgChangeBean {
/**
* 销售服务费
**/
private BigDecimal serviceFee;
/**
* 证件类型
**/
private String idType;
/**
* 员工所在的部门名称
**/
private String empDeptName;
/**
* 销售价
**/
private BigDecimal salePrice;
/**
* 可改签航段的顺序号
**/
private List<String> changeRangeSns;
/**
* 乘机人名字
**/
private String psgName;
/**
* 员工所在的部门编号
**/
private String empDeptNo;
/**
* 燃油费
**/
private BigDecimal tax;
/**
* 员工工号
**/
private String empNo;
/**
* 身份证号
**/
private String idNo;
/**
* 票号
**/
private String tkno;
/**
* 机建
**/
private BigDecimal airportFee;
/**
* 手机号
**/
private String phoneNumber;
/**
* 乘机人类型,1成人2儿童3婴儿
**/
private Integer psgType;
/**
* 乘机人顺序号
**/
private String sn;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkOrderRangeChangeBean.java 0 → 100644
浏览文件 @ 116e5625
package org.dromara.common.ys.model.res.airport.other;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TkOrderRangeChangeBean {
/**
* 到达机场三字码
**/
private String arriveAirport;
/**
* 星期几
**/
private String week;
/**
* 舱位代码
**/
private String cabin;
/**
* 舱位折扣
**/
private BigDecimal discount;
/**
* 出发航站楼
**/
private String departTerminal;
/**
* 到达城市名称
**/
private String arriveCityName;
/**
* 共享航班号
**/
private String shareFlightNo;
/**
* 到达时间
**/
private String arriveTime;
/**
* 能否改签 1能 0不能
**/
private String canChange;
/**
* 到达机场名称
**/
private String arriveAirportName;
/**
* 退票规则
**/
private String refundRule;
/**
* 机型
**/
private String model;
/**
* 航段顺序号
**/
private Integer sn;
/**
* 航司
**/
private String airline;
/**
* 舱位名称
**/
private String cabinName;
/**
* 改签规则
**/
private String changeRule;
/**
* 到达航站楼
**/
private String arriveTermina;
/**
* 出发城市名称
**/
private String departCityName;
/**
* 出发时间 格式为 13:10
**/
private String departTime;
/**
* 到达日期
**/
private String arriveDate;
/**
* 是否有餐食,1有餐食,0表示没有餐食
**/
private Integer hasfood;
/**
* 出发机场名称
**/
private String departAirport;
/**
* 航班号
**/
private String flightNo;
/**
* 升舱规则
**/
private String upgradeRule;
/**
* 退票状态,0正常,1 已退
**/
private Integer refundFlag;
/**
* 出发日期,格式为2017-06-16
**/
private String departDate;
/**
* 出发机场三字码
**/
private String departAirportName;
/**
* 飞行时长
**/
private String flightTime;
/**
* 航司名称
**/
private String airlineName;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IAirportService.java
浏览文件 @ 116e5625
......@@ -2,10 +2,29 @@ package org.dromara.common.ys.service;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.model.req.airport.OrderConfirmModel;
import org.dromara.common.ys.model.req.airport.OrderPayModel;
import org.dromara.common.ys.model.req.airport.OrderRefundCancelModel;
import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
import org.dromara.common.ys.model.req.airport.*;
import org.dromara.common.ys.model.res.airport.AddChangeOrderModel;
import org.dromara.common.ys.model.res.airport.CheckCabinModel;
import org.dromara.common.ys.model.res.airport.CheckPriceForFlightModel;
import org.dromara.common.ys.model.res.airport.CheckXyhBmdModel;
import org.dromara.common.ys.model.res.airport.GetTicketStatusModel;
import org.dromara.common.ys.model.res.airport.GetVoyageForChangeModel;
import org.dromara.common.ys.model.res.airport.MatchClbzModel;
import org.dromara.common.ys.model.res.airport.OrderCheckPriceModel;
import org.dromara.common.ys.model.res.airport.OrderListModel;
import org.dromara.common.ys.model.res.airport.OrderRefundAddModel;
import org.dromara.common.ys.model.res.airport.OrderRefundDetailModel;
import org.dromara.common.ys.model.res.airport.OrderRefundListModel;
import org.dromara.common.ys.model.res.airport.PlaneCheckStateModel;
import org.dromara.common.ys.model.res.airport.QueryChangeOrderModel;
import org.dromara.common.ys.model.res.airport.QueryFlightByHbhModel;
import org.dromara.common.ys.model.res.airport.QueryFlightForChangeModel;
import org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel;
import org.dromara.common.ys.model.res.airport.QueryFlightModel;
import org.dromara.common.ys.model.res.airport.QueryFlightRuleModel;
import org.dromara.common.ys.model.res.airport.QueryMoreCabinModel;
import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
import org.dromara.common.ys.model.res.airport.RefundOfVoyageModel;
import org.dromara.common.ys.model.res.airport.*;
import java.util.List;
......@@ -24,6 +43,105 @@ public interface IAirportService {
*/
QueryFlightModel queryFlight(String userId, org.dromara.common.ys.model.req.airport.QueryFlightModel model);
/**
* 获取退改规则
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
QueryFlightRuleModel queryFlightRule(String userId, org.dromara.common.ys.model.req.airport.QueryFlightRuleModel model);
/**
* 匹配差旅标准
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
MatchClbzModel matchClbz(String userId, org.dromara.common.ys.model.req.airport.MatchClbzModel model);
/**
* 航段验价
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
CheckPriceForFlightModel checkPriceForFlight(String userId, org.dromara.common.ys.model.req.airport.CheckPriceForFlightModel model);
/**
* 验舱
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
CheckCabinModel checkCabin(String userId, org.dromara.common.ys.model.req.airport.CheckCabinModel model);
/**
* 验证三方协议白名单
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
CheckXyhBmdModel checkXyhBmd(String userId, org.dromara.common.ys.model.req.airport.CheckXyhBmdModel model);
/**
* 获取客票状态
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
PlaneCheckStateModel planeCheckState(String userId, org.dromara.common.ys.model.req.airport.PlaneCheckStateModel model);
/**
* 根据票号获取客票状态
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
GetTicketStatusModel getTicketStatus(String userId, org.dromara.common.ys.model.req.airport.GetTicketStatusModel model);
/**
* 获取可改签航段
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
GetVoyageForChangeModel getVoyageForChange(String userId, org.dromara.common.ys.model.req.airport.GetVoyageForChangeModel model);
/**
* 改签航班查询
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
QueryFlightForChangeModel queryFlightForChange(String userId, org.dromara.common.ys.model.req.airport.QueryFlightForChangeModel model);
/**
* 申请改签
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
AddChangeOrderModel addChangeOrderModel(String userId, org.dromara.common.ys.model.req.airport.AddChangeOrderModel model);
/**
* 改签单详情
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
QueryChangeOrderModel queryChangeOrder(String userId, org.dromara.common.ys.model.req.airport.QueryChangeOrderModel model);
/**
* 查询航班最低价
*
......@@ -33,6 +151,22 @@ public interface IAirportService {
*/
QueryFlightMinPriceModel queryFlightMinPrice(String userId, org.dromara.common.ys.model.req.airport.QueryFlightMinPriceModel model);
/**
* 取消改签单
*
* @param userId 用户id
* @param model 查询参数
*/
void cancelChangeOrder(String userId, CancelChangeOrderModel model);
/**
* 改签单调度
*
* @param userId 用户id
* @param model 查询参数
*/
void changeDispatch(String userId, DispatchChangeOrderModel model);
/**
* 指定航班获取舱位价格（第二屏）
*
......@@ -60,6 +194,15 @@ public interface IAirportService {
*/
PageInfo<OrderListModel> orderList(String userId, org.dromara.common.ys.model.req.airport.OrderListModel model);
/**
* 退签单列表
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
PageInfo<PlaneOrderQueryChangeOrderApiBeanModel> changeQueryList(String userId, PlaneOrderQueryChangeOrderApiModel model);
/**
* 查询订单详情
*
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IVehiclesService.java
浏览文件 @ 116e5625
......@@ -2,6 +2,7 @@ package org.dromara.common.ys.service;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.model.req.vehicles.*;
import org.dromara.common.ys.model.res.vehicles.OrderGetQxyyModel;
import java.util.List;
......@@ -99,5 +100,5 @@ public interface IVehiclesService {
* @param userId 用户id
* @return 取消原因列表
*/
List<org.dromara.common.ys.model.res.vehicles.OrderGetQxyyModel> getCancelReasonList(String userId);
List<OrderGetQxyyModel> getCancelReasonList(String userId);
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java
浏览文件 @ 116e5625
......@@ -9,9 +9,29 @@ import org.dromara.common.ys.common.Code;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.enums.DomainEnum;
import org.dromara.common.ys.enums.airport.AirportApiEnum;
import org.dromara.common.ys.model.req.airport.OrderConfirmModel;
import org.dromara.common.ys.model.req.airport.OrderPayModel;
import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
import org.dromara.common.ys.model.req.airport.*;
import org.dromara.common.ys.model.res.airport.AddChangeOrderModel;
import org.dromara.common.ys.model.res.airport.CheckCabinModel;
import org.dromara.common.ys.model.res.airport.CheckPriceForFlightModel;
import org.dromara.common.ys.model.res.airport.CheckXyhBmdModel;
import org.dromara.common.ys.model.res.airport.GetTicketStatusModel;
import org.dromara.common.ys.model.res.airport.GetVoyageForChangeModel;
import org.dromara.common.ys.model.res.airport.MatchClbzModel;
import org.dromara.common.ys.model.res.airport.OrderCheckPriceModel;
import org.dromara.common.ys.model.res.airport.OrderListModel;
import org.dromara.common.ys.model.res.airport.OrderRefundAddModel;
import org.dromara.common.ys.model.res.airport.OrderRefundDetailModel;
import org.dromara.common.ys.model.res.airport.OrderRefundListModel;
import org.dromara.common.ys.model.res.airport.PlaneCheckStateModel;
import org.dromara.common.ys.model.res.airport.QueryChangeOrderModel;
import org.dromara.common.ys.model.res.airport.QueryFlightByHbhModel;
import org.dromara.common.ys.model.res.airport.QueryFlightForChangeModel;
import org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel;
import org.dromara.common.ys.model.res.airport.QueryFlightModel;
import org.dromara.common.ys.model.res.airport.QueryFlightRuleModel;
import org.dromara.common.ys.model.res.airport.QueryMoreCabinModel;
import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
import org.dromara.common.ys.model.res.airport.RefundOfVoyageModel;
import org.dromara.common.ys.model.res.airport.*;
import org.dromara.common.ys.service.IAirportService;
import org.springframework.stereotype.Service;
......@@ -43,6 +63,182 @@ public class AirPortServiceImpl implements IAirportService {
return JSON.parseObject(res.getData(), QueryFlightModel.class);
}
@Override
public QueryFlightRuleModel queryFlightRule(String userId, org.dromara.common.ys.model.req.airport.QueryFlightRuleModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.QUERY_FLIGHT_RULE.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), QueryFlightRuleModel.class);
}
@Override
public MatchClbzModel matchClbz(String userId, org.dromara.common.ys.model.req.airport.MatchClbzModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.MATCH_CLBZ.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), MatchClbzModel.class);
}
@Override
public CheckPriceForFlightModel checkPriceForFlight(String userId, org.dromara.common.ys.model.req.airport.CheckPriceForFlightModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHECK_PRICE_FOR_FLIGHT.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), CheckPriceForFlightModel.class);
}
@Override
public CheckCabinModel checkCabin(String userId, org.dromara.common.ys.model.req.airport.CheckCabinModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHECK_CABIN.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), CheckCabinModel.class);
}
@Override
public CheckXyhBmdModel checkXyhBmd(String userId, org.dromara.common.ys.model.req.airport.CheckXyhBmdModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHECK_XYH_BMD.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), CheckXyhBmdModel.class);
}
@Override
public PlaneCheckStateModel planeCheckState(String userId, org.dromara.common.ys.model.req.airport.PlaneCheckStateModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHECK_XYH_BMD.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), PlaneCheckStateModel.class);
}
@Override
public GetTicketStatusModel getTicketStatus(String userId, org.dromara.common.ys.model.req.airport.GetTicketStatusModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.GET_TICKET_STATUS.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), GetTicketStatusModel.class);
}
@Override
public GetVoyageForChangeModel getVoyageForChange(String userId, org.dromara.common.ys.model.req.airport.GetVoyageForChangeModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.GET_VOYAGE_FOR_CHANGE.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), GetVoyageForChangeModel.class);
}
@Override
public QueryFlightForChangeModel queryFlightForChange(String userId, org.dromara.common.ys.model.req.airport.QueryFlightForChangeModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.QUERY_FLIGHT_FOR_CHANGE.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), QueryFlightForChangeModel.class);
}
@Override
public AddChangeOrderModel addChangeOrderModel(String userId, org.dromara.common.ys.model.req.airport.AddChangeOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.ADD_CHANGE_ORDER.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), AddChangeOrderModel.class);
}
@Override
public QueryChangeOrderModel queryChangeOrder(String userId, org.dromara.common.ys.model.req.airport.QueryChangeOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.QUERY_CHANGE_ORDER.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), QueryChangeOrderModel.class);
}
@Override
public QueryFlightMinPriceModel queryFlightMinPrice(String userId, org.dromara.common.ys.model.req.airport.QueryFlightMinPriceModel model) {
ApiHttpResponse res = Api.v1(
......@@ -59,6 +255,36 @@ public class AirPortServiceImpl implements IAirportService {
return JSON.parseObject(res.getData(), QueryFlightMinPriceModel.class);
}
@Override
public void cancelChangeOrder(String userId, CancelChangeOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CANCEL_CHANGE_ORDER.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
}
@Override
public void changeDispatch(String userId, DispatchChangeOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHANGE_DISPATCH.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
}
@Override
public QueryMoreCabinModel queryMoreCabin(String userId, org.dromara.common.ys.model.req.airport.QueryMoreCabinModel model) {
ApiHttpResponse res = Api.v1(
......@@ -123,6 +349,38 @@ public class AirPortServiceImpl implements IAirportService {
.setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), OrderListModel.class));
}
@Override
public PageInfo<PlaneOrderQueryChangeOrderApiBeanModel> changeQueryList(String userId, PlaneOrderQueryChangeOrderApiModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CHANGE_QUERY_LIST.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
if (res.getData() == null) {
return PageInfo.<PlaneOrderQueryChangeOrderApiBeanModel>builder().build()
.setCount(model.getCount())
.setMap(Collections.emptyMap())
.setPageNum(model.getPageNum())
.setPages(0)
.setTotal(0)
.setList(Collections.emptyList());
}
PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderList"), PageInfo.class);
return PageInfo.<PlaneOrderQueryChangeOrderApiBeanModel>builder().build()
.setCount(pageInfo.getCount())
.setMap(pageInfo.getMap())
.setPageNum(pageInfo.getPageNum())
.setPages(pageInfo.getPages())
.setTotal(pageInfo.getTotal())
.setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), PlaneOrderQueryChangeOrderApiBeanModel.class));
}
@Override
public QueryTkOrderModel detail(String userId, org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
ApiHttpResponse res = Api.v1(
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/VehiclesServiceImpl.java
浏览文件 @ 116e5625
......@@ -10,6 +10,7 @@ import org.dromara.common.ys.enums.DomainEnum;
import org.dromara.common.ys.enums.vehicles.VehiclesApiEnum;
import org.dromara.common.ys.model.req.vehicles.EstimateJsycPriceModel;
import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
import org.dromara.common.ys.model.res.airport.vehicles.*;
import org.dromara.common.ys.model.res.vehicles.*;
import org.dromara.common.ys.service.IVehiclesService;
import org.springframework.stereotype.Service;
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java
浏览文件 @ 116e5625
......@@ -12,6 +12,7 @@ import org.dromara.common.ys.constant.TripType;
import org.dromara.common.ys.model.req.vehicles.EstimateJsycPriceModel;
import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
import org.dromara.common.ys.model.req.vehicles.OrderDetailModel;
import org.dromara.common.ys.model.res.airport.vehicles.*;
import org.dromara.common.ys.model.res.vehicles.*;
import org.dromara.common.ys.service.IVehiclesService;
import org.dromara.server.base.BaseController;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论