Skip to content

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

代码优化

上级 9eac77b7
隐藏空白字符变更
内嵌 并排
正在显示 包含 921 行增加 和 29 行删除
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/OrderRefundAddModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundAddModel extends BaseModel {
/**
* 是否自愿退票，退票类型1自愿2非自愿
**/
private Integer refundType;
/**
* 退票证明url地址
**/
private String refundProveUrl;
/**
* 需要退票的订单编号
**/
private String orderNo;
/**
* 乘机人顺序号，多个以,隔开
**/
private String psgSns;
/**
* 航段顺序号，多个以,隔开
**/
private String rangeSns;
/**
* 退票原因，非自愿的时候必填（数据来源于基础数据接口），自愿的时候可为空（默认为自愿退票）
**/
private String refundResaon;
/**
* 企业退票原因
**/
private String refundReasonVip;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/OrderRefundCancelModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundCancelModel extends BaseModel {
/**
* 退票订单编号
**/
private String refundNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/OrderRefundDetailModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundDetailModel extends BaseModel {
/**
* 订单编号，订单编号、退票订单编号不能同时为空
**/
private String orderNo;
/**
* 退票订单编号，订单编号、退票订单编号不能同时为空
**/
private String refundNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/OrderRefundListModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundListModel extends BaseModel {
/**
* 预订人
**/
private String bookNo;
/**
* 日期类型 1预定日期 2出行日期 3出票/确认日期
**/
private Integer dateType;
/**
* 订单号
**/
private String orderNo;
/**
* 退票订单号
**/
private String refundNo;
/**
* 时间始 格式：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/RefundOfVoyageModel.java 0 → 100644
浏览文件 @ d3ee621e
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 RefundOfVoyageModel extends BaseModel {
/**
* 订单编号
**/
private String orderNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/OrderRefundAddModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundAddModel {
/**
* 退票订单编号集合
**/
private List<String> refundNoList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/OrderRefundDetailModel.java 0 → 100644
浏览文件 @ d3ee621e
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.airport.other.InsuranceInfoBean;
import org.dromara.common.ys.model.res.airport.other.OrderBusinessInfoBean;
import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
import org.dromara.common.ys.model.res.airport.other.OrderRangeInfoBean;
import java.math.BigDecimal;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class OrderRefundDetailModel {
/**
* 航程中文（机场）
**/
private String voyageAirportZh;
/**
* 退保险金额
**/
private BigDecimal refundInsureAmount;
/**
* 退票价
**/
private BigDecimal refundSalePrice;
/**
* 退票手续费
**/
private BigDecimal cuRefundPoundage;
/**
* 乘机人姓名
**/
private String psg;
/**
* 手续费率
**/
private BigDecimal cuRefundRate;
/**
* 退票订单状态名称
**/
private String refundOrderName;
/**
* 舱位
**/
private String cabin;
/**
* 退保险份数
**/
private Integer refundInsureNum;
/**
* 航程中文（城市）
**/
private String voyageZh;
/**
* 乘机人证件号码
**/
private String idNo;
/**
* 票号
**/
private String tkno;
/**
* 到达时间，格式：yyyy-MM-dd HH:mm
**/
private String arriveTime;
/**
* 乘机人类型，1成儿 2儿童 3婴儿
**/
private String psgType;
/**
* 退单号
**/
private String refundOrderNo;
/**
* 支付信息集合 适用于多科目支付
**/
private List<OrderPayInfoBean> payInfoList;
/**
* 国内国际，0国际 1国内
**/
private Integer international;
/**
* 退机建
**/
private BigDecimal refundAirportFee;
/**
* 退服务费
**/
private BigDecimal refundServiceFee;
/**
* 乘机人顺序号
**/
private Integer psgSn;
/**
* 舱位名称
**/
private String cabinName;
/**
* 加收服务费
**/
private BigDecimal serviceFee;
/**
* 原正常单号
**/
private String orderNo;
/**
* 起飞日期，格式：yyyy-MM-dd HH:mm
**/
private String departTime;
/**
* 乘机人员工所在部门名称
**/
private String empDeptName;
/**
* 乘机人证件类型，NI身份证 PP护照 ID其他
**/
private String idType;
/**
* 保险明细集合
**/
private List<InsuranceInfoBean> insuranceList;
/**
* 应退金额
**/
private String cuRefundAmount;
/**
* PNR编码
**/
private String pnrNO;
/**
* 乘机人员工所在部门编号
**/
private String empDeptNo;
/**
* 乘机人员工工号
**/
private String empNo;
/**
* 退票办理时间，格式：yyyy-MM-dd HH:mm:ss
**/
private String checkDate;
/**
* 航程
**/
private String voyage;
/**
* 差旅信息
**/
private OrderBusinessInfoBean businessInfo;
/**
* 航班号
**/
private String flightNo;
/**
* 航段信息
**/
private List<OrderRangeInfoBean> orderRangeList;
/**
* 退票订单状态代码
**/
private String refundOrderStatus;
/**
* 退升舱费
**/
private BigDecimal cuRefundUpFee;
/**
* 预订渠道
**/
private String orderFrom;
/**
* 退票原因
**/
private String refundResaon;
/**
* 企业退票原因
**/
private String refundReasonVip;
/**
* 申请时间，格式：yyyy-MM-dd HH:mm:ss
**/
private String applyDate;
/**
* 退燃油税
**/
private BigDecimal refundTax;
/**
* 退款状态，0未退 1已退
**/
private Integer payStatus;
/**
* 支付信息 只返回最后一种支付科目的信息
**/
private OrderPayInfoBean payInfo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/OrderRefundListModel.java 0 → 100644
浏览文件 @ d3ee621e
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 OrderRefundListModel {
/**
* 预定时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String bookDate;
/**
* 原订单号
**/
private String orderNo;
/**
* 起飞时间YYYY-MM-DD
**/
private String departTime;
/**
* 乘机人
**/
private String psg;
/**
* 预订人名称
**/
private String bookerName;
/**
* 航程中文
**/
private String voyageZh;
/**
* 订单状态名称
**/
private String orderStatusName;
/**
* 退票类型1自愿2非自愿
**/
private Integer refundType;
/**
* 订单总金额
**/
private BigDecimal totalAmount;
/**
* 航程类型1单程2往返3联程4缺口
**/
private Integer voyageType;
/**
* 差旅类型 1因公 2因私
**/
private Integer tripType;
/**
* 预定人工号
**/
private String bookerNo;
/**
* 航班号
**/
private String flightNo;
/**
* 退票编号
**/
private String refundNo;
/**
* 出票时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String drawDate;
/**
* 舱位名称
**/
private String cabinName;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/RefundOfVoyageModel.java 0 → 100644
浏览文件 @ d3ee621e
package org.dromara.common.ys.model.res.airport;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.airport.other.TkOrderPsgAPIBean;
import org.dromara.common.ys.model.res.airport.other.TkOrderRangeAPIBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class RefundOfVoyageModel {
/**
* 乘机人集合
**/
private List<TkOrderPsgAPIBean> psgBeanList;
/**
* 航段集合
**/
private List<TkOrderRangeAPIBean> rangeBeanList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkOrderPsgAPIBean.java 0 → 100644
浏览文件 @ d3ee621e
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 TkOrderPsgAPIBean {
/**
* 销售服务费
**/
private BigDecimal serviceFee;
/**
* 证件类型
**/
private String idType;
/**
* 员工所在的部门名称
**/
private String empDeptName;
/**
* 销售价
**/
private BigDecimal salePrice;
/**
* 乘机人名字
**/
private String psgName;
/**
* 员工所在的部门编号
**/
private String empDeptNo;
/**
* 燃油费
**/
private BigDecimal tax;
/**
* 员工工号
**/
private String empNo;
/**
* 身份证号
**/
private String idNo;
/**
* 票号
**/
private String tkno;
/**
* 机建
**/
private BigDecimal airportFee;
/**
* 乘机人可退航段顺序号集合，选择员工的时候 用来判断哪些航段可以选择
**/
private List<String> refundRangeList;
/**
* 手机号
**/
private String phoneNumber;
/**
* 乘机人类型，1成人2儿童3婴儿
**/
private Integer psgType;
/**
* 乘机人顺序号
**/
private Integer sn;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/other/TkOrderRangeAPIBean.java 0 → 100644
浏览文件 @ d3ee621e
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 TkOrderRangeAPIBean {
/**
* 到达机场三字码
**/
private String arriveAirport;
/**
* 星期几
**/
private String week;
/**
* 舱位代码
**/
private String cabin;
/**
* 舱位折扣
**/
private BigDecimal discount;
/**
* 出发航站楼
**/
private String departTerminal;
/**
* 到达城市名称
**/
private String arriveCityName;
/**
* 到达时间，格式为 13:10
**/
private String arriveTime;
/**
* 到达机场名称
**/
private String arriveAirportName;
/**
* 退票规则
**/
private String refundRule;
/**
* 机型
**/
private String model;
/**
* 航段顺序号
**/
private Integer sn;
/**
* 航司
**/
private String airline;
/**
* 舱位名称
**/
private String cabinName;
/**
* 改签规则
**/
private String changeRule;
/**
* 出发城市名称
**/
private String departCityName;
/**
* 出发时间，格式为 13:10
**/
private String departTime;
/**
* 到达航站楼
**/
private String arriveTerminal;
/**
* 到达日期，格式为2017-06-16
**/
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
浏览文件 @ d3ee621e
......@@ -2,10 +2,9 @@ package org.dromara.common.ys.service;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.model.req.airport.*;
import org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel;
import org.dromara.common.ys.model.res.airport.CancelOrderModel;
import org.dromara.common.ys.model.res.airport.QueryFlightStopVOModel;
import org.dromara.common.ys.model.req.airport.OrderRefundCancelModel;
import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
import org.dromara.common.ys.model.res.airport.*;
import java.util.List;
......@@ -21,7 +20,7 @@ public interface IAirportService {
* @param model 查询参数
* @return 查询结果
*/
org.dromara.common.ys.model.res.airport.QueryFlightModel queryFlight(String userId, QueryFlightModel model);
QueryFlightModel queryFlight(String userId, org.dromara.common.ys.model.req.airport.QueryFlightModel model);
/**
* 查询航班最低价
......@@ -30,7 +29,7 @@ public interface IAirportService {
* @param model 查询参数
* @return 查询结果
*/
org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel queryFlightMinPrice(String userId, QueryFlightMinPriceModel model);
QueryFlightMinPriceModel queryFlightMinPrice(String userId, org.dromara.common.ys.model.req.airport.QueryFlightMinPriceModel model);
/**
* 创建订单
......@@ -39,7 +38,7 @@ public interface IAirportService {
* @param model 订单
* @return 订单列表
*/
List<org.dromara.common.ys.model.res.airport.BookOrderModel> bookOrder(String userId, BookOrderModel model);
List<BookOrderModel> bookOrder(String userId, org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel model);
/**
* 查询订单列表
......@@ -48,7 +47,7 @@ public interface IAirportService {
* @param model 查询参数
* @return 查询结果
*/
PageInfo<org.dromara.common.ys.model.res.airport.OrderListModel> orderList(String userId, OrderListModel model);
PageInfo<OrderListModel> orderList(String userId, org.dromara.common.ys.model.req.airport.OrderListModel model);
/**
* 查询订单详情
......@@ -57,7 +56,7 @@ public interface IAirportService {
* @param model 查询参数
* @return 查询结果
*/
org.dromara.common.ys.model.res.airport.QueryTkOrderModel detail(String userId, QueryTkOrderModel model);
QueryTkOrderModel detail(String userId, org.dromara.common.ys.model.req.airport.QueryTkOrderModel model);
/**
* 取消订单
......@@ -76,4 +75,50 @@ public interface IAirportService {
*/
QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopModel model);
/**
* 获取可退航段
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
RefundOfVoyageModel orderRefundOfVoyage(String userId, org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model);
/**
* 申请退票
*
* @param userId 用户id
* @param model 申请退票参数
* @return 申请退票结果
*/
OrderRefundAddModel orderRefundAdd(String userId, org.dromara.common.ys.model.req.airport.OrderRefundAddModel model);
/**
* 申请退票
*
* @param userId 用户id
* @param model 申请退票参数
* @return 申请退票结果
*/
List<OrderRefundDetailModel> orderRefundDetail(String userId, org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model);
/**
* 取消退票
*
* @param userId 用户id
* @param model 取消退票参数
* @return 取消退票结果
*/
Boolean orderRefundCancel(String userId, OrderRefundCancelModel model);
/**
* 退票列表
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
PageInfo<OrderRefundListModel> orderRefundList(String userId, org.dromara.common.ys.model.req.airport.OrderRefundListModel model);
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java
浏览文件 @ d3ee621e
......@@ -9,10 +9,8 @@ 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.*;
import org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel;
import org.dromara.common.ys.model.res.airport.CancelOrderModel;
import org.dromara.common.ys.model.res.airport.QueryFlightStopVOModel;
import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
import org.dromara.common.ys.model.res.airport.*;
import org.dromara.common.ys.service.IAirportService;
import org.springframework.stereotype.Service;
......@@ -28,7 +26,7 @@ import java.util.List;
public class AirPortServiceImpl implements IAirportService {
@Override
public org.dromara.common.ys.model.res.airport.QueryFlightModel queryFlight(String userId, QueryFlightModel model) {
public QueryFlightModel queryFlight(String userId, org.dromara.common.ys.model.req.airport.QueryFlightModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -40,11 +38,11 @@ public class AirPortServiceImpl implements IAirportService {
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), org.dromara.common.ys.model.res.airport.QueryFlightModel.class);
return JSON.parseObject(res.getData(), QueryFlightModel.class);
}
@Override
public org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel queryFlightMinPrice(String userId, QueryFlightMinPriceModel model) {
public QueryFlightMinPriceModel queryFlightMinPrice(String userId, org.dromara.common.ys.model.req.airport.QueryFlightMinPriceModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -56,11 +54,11 @@ public class AirPortServiceImpl implements IAirportService {
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel.class);
return JSON.parseObject(res.getData(), QueryFlightMinPriceModel.class);
}
@Override
public List<org.dromara.common.ys.model.res.airport.BookOrderModel> bookOrder(String userId, BookOrderModel model) {
public List<BookOrderModel> bookOrder(String userId, org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -72,11 +70,11 @@ public class AirPortServiceImpl implements IAirportService {
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("orderList"), org.dromara.common.ys.model.res.airport.BookOrderModel.class);
return JSON.parseArray(JSON.parseObject(res.getData()).getString("orderList"), BookOrderModel.class);
}
@Override
public PageInfo<org.dromara.common.ys.model.res.airport.OrderListModel> orderList(String userId, OrderListModel model) {
public PageInfo<OrderListModel> orderList(String userId, org.dromara.common.ys.model.req.airport.OrderListModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -89,7 +87,7 @@ public class AirPortServiceImpl implements IAirportService {
throw new RuntimeException(res.getTips());
}
if (res.getData() == null) {
return PageInfo.<org.dromara.common.ys.model.res.airport.OrderListModel>builder().build()
return PageInfo.<OrderListModel>builder().build()
.setCount(model.getCount())
.setMap(Collections.emptyMap())
.setPageNum(model.getPageNum())
......@@ -98,17 +96,17 @@ public class AirPortServiceImpl implements IAirportService {
.setList(Collections.emptyList());
}
PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderList"), PageInfo.class);
return PageInfo.<org.dromara.common.ys.model.res.airport.OrderListModel>builder().build()
return PageInfo.<OrderListModel>builder().build()
.setCount(pageInfo.getCount())
.setMap(pageInfo.getMap())
.setPageNum(pageInfo.getPageNum())
.setPages(pageInfo.getPages())
.setTotal(pageInfo.getTotal())
.setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), org.dromara.common.ys.model.res.airport.OrderListModel.class));
.setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), OrderListModel.class));
}
@Override
public org.dromara.common.ys.model.res.airport.QueryTkOrderModel detail(String userId, QueryTkOrderModel model) {
public QueryTkOrderModel detail(String userId, org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -120,7 +118,7 @@ public class AirPortServiceImpl implements IAirportService {
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), org.dromara.common.ys.model.res.airport.QueryTkOrderModel.class);
return JSON.parseObject(res.getData(), QueryTkOrderModel.class);
}
@Override
......@@ -153,4 +151,100 @@ public class AirPortServiceImpl implements IAirportService {
throw new RuntimeException(res.getTips());
}
}
@Override
public RefundOfVoyageModel orderRefundOfVoyage(String userId, org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.GET_VOYAGE_FOR_REFUND.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(res.getData(), RefundOfVoyageModel.class);
}
@Override
public OrderRefundAddModel orderRefundAdd(String userId, org.dromara.common.ys.model.req.airport.OrderRefundAddModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.ADD_REFUND_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(), OrderRefundAddModel.class);
}
@Override
public List<OrderRefundDetailModel> orderRefundDetail(String userId, org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.QUERY_REFUND_ORDER.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("refundOrderList"),OrderRefundDetailModel.class);
}
@Override
public Boolean orderRefundCancel(String userId, org.dromara.common.ys.model.req.airport.OrderRefundCancelModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.CANCEL_REFUND_ORDER.getUrl(),
userId,
null,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return true;
}
@Override
public PageInfo<OrderRefundListModel> orderRefundList(String userId, org.dromara.common.ys.model.req.airport.OrderRefundListModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
AirportApiEnum.REFUND_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.<OrderRefundListModel>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.<OrderRefundListModel>builder().build()
.setCount(pageInfo.getCount())
.setMap(pageInfo.getMap())
.setPageNum(pageInfo.getPageNum())
.setPages(pageInfo.getPages())
.setTotal(pageInfo.getTotal())
.setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), OrderRefundListModel.class));
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java
浏览文件 @ d3ee621e
......@@ -19,10 +19,7 @@ import org.dromara.common.ys.model.req.airport.OrderListModel;
import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
import org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel;
import org.dromara.common.ys.model.req.insurance.BxcpModel;
import org.dromara.common.ys.model.res.airport.CancelOrderModel;
import org.dromara.common.ys.model.res.airport.QueryFlightModel;
import org.dromara.common.ys.model.res.airport.QueryFlightStopVOModel;
import org.dromara.common.ys.model.res.airport.QueryTkOrderModel;
import org.dromara.common.ys.model.res.airport.*;
import org.dromara.common.ys.model.res.comomResource.AirportModel;
import org.dromara.common.ys.service.IAirportService;
import org.dromara.common.ys.service.ICommonResourceService;
......@@ -182,4 +179,51 @@ public class AirportController extends BaseController {
public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopModel model) {
return R.ok(airPortService.queryFlightStop("15301818478", model));
}
/**
* 获取可退航段
*/
@GetMapping("/orderRefundOfVoyage")
public R<RefundOfVoyageModel> orderRefundOfVoyage(org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model) {
return R.ok(airPortService.orderRefundOfVoyage(getUserId(), model));
}
/**
* 退票单申请
*/
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/orderRefund/apply")
public R<OrderRefundAddModel> orderRefundApply(@RequestBody org.dromara.common.ys.model.req.airport.OrderRefundAddModel model) {
OrderRefundAddModel res = airPortService.orderRefundAdd(getUserId(), model);
return R.ok(res);
}
/**
* 退票单详情
*/
@GetMapping("/orderRefund/detail")
public R<List<OrderRefundDetailModel>> orderRefundDetail(org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model) {
return R.ok(airPortService.orderRefundDetail(getUserId(), model));
}
/**
* 退票单取消
*/
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/orderRefund/cancel")
public R<Boolean> orderRefundCancel(@RequestBody org.dromara.common.ys.model.req.airport.OrderRefundCancelModel model) {
Boolean result = airPortService.orderRefundCancel(getUserId(), model);
return R.ok(result);
}
/**
* 退票单列表
*/
@GetMapping("/orderRefund/list")
public R<PageInfo<OrderRefundListModel>> orderRefundList(org.dromara.common.ys.model.req.airport.OrderRefundListModel model) {
model.setBookNo(getUserId());
return R.ok(airPortService.orderRefundList(getUserId(), model));
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论