Skip to content

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

代码优化

上级 4c3ed04b
隐藏空白字符变更
内嵌 并排
正在显示 包含 961 行增加 和 46 行删除
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/enums/train/TrainApiEnum.java
浏览文件 @ dd728233
......@@ -44,7 +44,122 @@ public enum TrainApiEnum implements ApiEnum {
/**
* 车次查询列表
*/
QUERY("/open/train/shopping/query", "根据出发到达获取到车次列表");
QUERY("/open/train/shopping/query", "根据出发到达获取到车次列表"),
/**
* 17.退单详情
**/
QUERY_REFUND_ORDER("/open/train/order/queryRefundOrder" , "根据退单号获取退票单详情。"),
/**
* 72.取消退单
**/
REFUND_CANCEL("/open/train/refund/cancel" , "根据退单号取消退票单。"),
/**
* 60.改签单申请
**/
APPLY("/open/train/change/apply" , "改签单申请。"),
/**
* 4.校验注册12306账号接口接收到的短信验证码
**/
CHECK_REGISTER_CODE("/open/train/set/checkRegisterCode" , "校验注册12306账号接口接收到的短信验证码。"),
/**
* 2.校验12306账号核验接口接收到的短信验证码
**/
CHECK_ACCOUNT_CODE("/open/train/set/checkAccountCode" , "校验12306账号核验接口接收到的短信验证码。"),
/**
* 8.修改12306账号密码
**/
RESET_PWD("/open/train/set/resetPwd" , "修改12306账号密码。"),
/**
* 73.退票单列表
**/
QUERY_REFUND_LIST("/open/train/refund/queryRefundList" , "退票单列表查询。"),
/**
* 61.取消改签单
**/
CHANGE_CANCEL("/open/train/change/cancel" , "取消改签单。"),
/**
* 5.删除常旅客接口
**/
DELETE_CLK("/open/train/set/deleteClk" , "删除常旅客接口。"),
/**
* 62.改签单确认出票
**/
CHANGE_CONFIRM("/open/train/change/confirm" , "改签单确认出票。"),
/**
* 16.改签单详情
**/
QUERY_CHANGE_ORDER("/open/train/order/queryChangeOrder" , "根据改签单号获取改签单详情。"),
/**
* 65.改签单支付
**/
PAY_CHANGE_ORDER("/open/train/change/payChangeOrder" , "改签单支付"),
/**
* 2.车次经停站查询列表
**/
QUERY_BY_TRAIN_NO("/open/train/shopping/queryByTrainNo" , "车次经停站查询列表。"),
/**
* 13.火车票支付
**/
PAY_ORDER("/open/train/order/payOrder" , "火车票支付"),
/**
* 63.改签单列表
**/
QUERY_CHANGE_LIST("/open/train/change/queryChangeList" , "改签单列表查询。"),
/**
* 14.确认出票
**/
CONFIRM("/open/train/order/confirm" , "火车票确认出票"),
/**
* 70.申请退票
**/
REFUND_APPLY("/open/train/refund/apply" , "申请退票。"),
/**
* 9.校验修改12306账号密码接口收到的短信验证码
**/
CHECK_RESET_PWD("/open/train/set/checkResetPwd" , "校验修改12306账号密码接口收到的短信验证码。"),
/**
* 3.注册12306账号
**/
REGISTER("/open/train/set/register" , "注册12306账号。"),
/**
* 6.查询12306账号下的常旅客接口
**/
FIND_CLK("/open/train/set/findClk" , "查询12306账号下的常旅客接口。"),
/**
* 71.退单详情
**/
REFUND_QUERY_REFUND_ORDER("/open/train/refund/queryRefundOrder" , "根据退单号获取退票单详情。"),
/**
* 7.修改常旅客信息
**/
SAVE_CLK("/open/train/set/saveClk" , "修改常旅客信息。"),
/**
* 64.改签单详情
**/
CHANGE_QUERY_CHANGE_ORDER("/open/train/change/queryChangeOrder" , "根据改签单号获取改签单详情。");
/**
* 接口URL
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/train/OrderRefundApplyModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.req.train;
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 OrderRefundApplyModel extends BaseModel {
/**
* 订单编号
**/
private String orderNo;
/**
* 序号集合
**/
private List<String> sequenceNoList;
/**
* 企业退票原因
**/
private String refundReasonVip;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/train/OrderRefundCancelModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.req.train;
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 OrderRefundCancelModel extends BaseModel {
/**
* 退票订单号
**/
private String refundNo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/train/OrderRefundDetailModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.req.train;
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/train/OrderRefundListModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.req.train;
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 {
/**
* 客户状态1待送审 2 审批中 3办理中 4已办理未退款 5取消中 6已取消 7已退款
**/
private String customerStatus;
/**
* 预订人
**/
private String bookNo;
/**
* 日期类型 1预定日期 2出行日期 3出票/确认日期
**/
private Integer dateType;
/**
* 退票单号
**/
private String refundNo;
/**
* 时间始 格式：yyyy-MM-dd
**/
private String dateStart;
/**
* 原订单ID
**/
private String trOrderId;
/**
* 每页显示条数，不能小于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/train/TrainStopModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.req.train;
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 TrainStopModel extends BaseModel {
/**
* 乘车日期yyyy-MM-dd
**/
private String fromDate;
/**
* 目的站三字编码
**/
private String toStationCode;
/**
* 出发站三字编码
**/
private String fromStationCode;
/**
* 列车内部编码
**/
private String trainNo;
/**
* 列车代码
**/
private String trainCode;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/hotel/HtOrderInfoModel.java
浏览文件 @ dd728233
......@@ -5,8 +5,8 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.hotel.bean.HtOrderPriceInfoBean;
import org.dromara.common.ys.model.res.hotel.bean.HtOrderPsgInfoBean;
import org.dromara.common.ys.model.res.train.BusinessInfo;
import org.dromara.common.ys.model.res.train.PayInfo;
import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
import org.dromara.common.ys.model.res.train.bean.PayInfo;
import java.math.BigDecimal;
import java.util.List;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/hotel/HtRefundInfoModel.java
浏览文件 @ dd728233
......@@ -6,8 +6,8 @@ import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
import org.dromara.common.ys.model.res.hotel.bean.HotelOrderPsgInfoBean;
import org.dromara.common.ys.model.res.hotel.bean.HtRefundPriceInfoBean;
import org.dromara.common.ys.model.res.train.BusinessInfo;
import org.dromara.common.ys.model.res.train.PayInfo;
import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
import org.dromara.common.ys.model.res.train.bean.PayInfo;
import java.math.BigDecimal;
import java.util.List;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/OrderInfoModel.java
浏览文件 @ dd728233
......@@ -4,6 +4,10 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
import org.dromara.common.ys.model.res.train.bean.PayInfo;
import org.dromara.common.ys.model.res.train.bean.RangeInfo;
import org.dromara.common.ys.model.res.train.bean.TicketInfo;
import java.math.BigDecimal;
import java.util.List;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/OrderRefundApplyModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
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 OrderRefundApplyModel {
/**
* 退单订单编号集合
**/
private List<String> refundNoList;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/OrderRefundDetailModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
import org.dromara.common.ys.model.res.train.bean.BxOrderInfoBean;
import org.dromara.common.ys.model.res.train.bean.PayInfo;
import org.dromara.common.ys.model.res.train.bean.TrRefundticketInfoBean;
import java.util.List;
/**
* @author hzh
* @date 2024-11-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class OrderRefundDetailModel {
/**
* 出发站名称
**/
private String fromStationName;
/**
* 办理时间
**/
private String khwcsj;
/**
* 支付信息
**/
private PayInfo Pay;
/**
* 到达站三字码
**/
private String toStationCode;
/**
* 车次
**/
private String trainCode;
/**
* 退单状态代码
**/
private Integer customerStatus;
/**
* 席别9:商务座P:特等座M:一等座O:二等座/无座6:高级软卧4:软卧3:硬卧2:软座1:硬座/无座F动卧
**/
private String seatType;
/**
* 退票单号
**/
private String refundNo;
/**
* 出发城市名称
**/
private String fromCityName;
/**
* 出发时刻
**/
private String fromTime;
/**
* 支付信息集合 适用于多科目支付
**/
private List<OrderPayInfoBean> payInfoList;
/**
* 票号
**/
private String ticketCode;
/**
* 到达时刻
**/
private String toTime;
/**
* 差旅信息
**/
private BusinessInfo Business;
/**
* 车票行程
**/
private TrRefundticketInfoBean TrRefundticket;
/**
* 是否线下退票0否1是
**/
private String isOutlineRefund;
/**
* 到达城市名称
**/
private String toCityName;
/**
* 乘机人工号
**/
private String customerStatusName;
/**
* 旅行时长
**/
private Integer travelTime;
/**
* 原订单号
**/
private String orderNo;
/**
* 到达日期
**/
private String toDate;
/**
* 到达城市id
**/
private String toCity;
/**
* 出发星期
**/
private String fromWeek;
/**
* 出发日期
**/
private String fromDate;
/**
* 到达站名称
**/
private String toStationName;
/**
* 出发站三字码
**/
private String fromStationCode;
/**
* 预订渠道
**/
private String orderFrom;
/**
* 申请时间
**/
private String applyDate;
/**
* 出发城市id
**/
private String fromCity;
/**
* 保险信息
**/
private List<BxOrderInfoBean> BxOrderInfo;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/OrderRefundListModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
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 {
/**
* 乘车人
**/
private String passengerName;
/**
* 预定时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String bookDate;
/**
* 旅行时长
**/
private Integer travelTime;
/**
* 订单编号
**/
private String orderNo;
/**
* 原订单ID
**/
private String trOrderId;
/**
* 客户状态1待送审 2 审批中 3办理中 4已办理未退款 5取消中 6已取消 7已退款
**/
private String orderStatus;
/**
* 预订人名称
**/
private String bookerName;
/**
* 车次
**/
private String trainCode;
/**
* 出发星期
**/
private String fromWeek;
/**
* 出发日期
**/
private String fromDate;
/**
* 订单状态名称
**/
private String orderStatusName;
/**
* 订单总金额
**/
private BigDecimal totalAmount;
/**
* 差旅类型 1因公 2因私
**/
private Integer tripType;
/**
* 席别9:商务座P:特等座M:一等座O:二等座/无座6:高级软卧4:软卧3:硬卧2:软座1:硬座/无座F动卧
**/
private String seatType;
/**
* 预定人工号
**/
private String bookerNo;
/**
* 退票单号
**/
private String refundNo;
/**
* 座位号（车厢+座位）
**/
private String seatCode;
/**
* 出发时刻
**/
private String fromTime;
/**
* 票号
**/
private String ticketCode;
/**
* 出票时间 格式：yyyy-MM-dd HH:mm:ss
**/
private String drawDate;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/TrainStopModel.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
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 TrainStopModel {
/**
* 到站时间 格式:HH:mm
**/
private String arriveTime;
/**
* 车次
**/
private String stationTrainCode;
/**
* 车站序号 格式：1
**/
private String stationNo;
/**
* 查询的行程是否经停站 只有查询的出发到达经过的站点 才会返回true
**/
private Boolean isOverHere;
/**
* 停靠时间(多久) 格式：6分钟
**/
private String stopOverTime;
/**
* 站点名称
**/
private String stationName;
/**
* 开车时间 格式:HH:mm
**/
private String startTime;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/BusinessInfo.java → ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/BusinessInfo.java
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
package org.dromara.common.ys.model.res.train.bean;
import lombok.Data;
import lombok.EqualsAndHashCode;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/BxOrderInfoBean.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train.bean;
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 BxOrderInfoBean {
/**
* 保险险种名称
**/
private String xzmc;
/**
* 退款金额
**/
private BigDecimal tkje;
/**
* 保险险种B_class
**/
private String xzid;
/**
* 保险订单号
**/
private String bxNo;
/**
* 保险份数
**/
private Integer bxfs;
/**
* 保险销售价
**/
private BigDecimal xsj;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/PayInfo.java → ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/PayInfo.java
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
package org.dromara.common.ys.model.res.train.bean;
import lombok.Data;
import lombok.EqualsAndHashCode;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/RangeInfo.java → ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/RangeInfo.java
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
package org.dromara.common.ys.model.res.train.bean;
import org.dromara.common.ys.model.BaseModel;
import lombok.Data;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/TicketInfo.java → ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/TicketInfo.java
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train;
package org.dromara.common.ys.model.res.train.bean;
import lombok.Data;
import lombok.EqualsAndHashCode;
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/train/bean/TrRefundticketInfoBean.java 0 → 100644
浏览文件 @ dd728233
package org.dromara.common.ys.model.res.train.bean;
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 TrRefundticketInfoBean {
/**
* 加收服务费
**/
private BigDecimal sellServiceCharge;
/**
* 乘车人姓名
**/
private String passengerName;
/**
* 应退金额
**/
private BigDecimal cuRefundAmount;
/**
* 乘机人所在部门名称
**/
private String empDeptName;
/**
* 乘车人类型
**/
private Integer idType;
/**
* 退票手续费
**/
private BigDecimal cuRefundPoundage;
/**
* 乘车人手机号
**/
private String linkMobile;
/**
* 国籍
**/
private String nation;
/**
* 手续费率
**/
private BigDecimal cuRefundRate;
/**
* 乘车人证件号码
**/
private String idCode;
/**
* 出生日期
**/
private String born;
/**
* 性别M男；F女
**/
private String sex;
/**
* 退票价
**/
private BigDecimal returnPrices;
/**
* 乘机人工号
**/
private String empNo;
/**
* 乘机人所在部门编号
**/
private String empDeptid;
/**
* 证件有效截止日期 yyyy-MM-dd
**/
private String expiryDate;
/**
* 乘车人证件类型
**/
private String passengerType;
/**
* 退服务费
**/
private BigDecimal refundServiceCharge;
/**
* id 此字段没任何用处
**/
private String id;
/**
* 退款状态
**/
private Integer payStatus;
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/ITrainService.java
浏览文件 @ dd728233
......@@ -2,9 +2,13 @@ package org.dromara.common.ys.service;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.model.req.train.QueryModel;
import org.dromara.common.ys.model.req.train.*;
import org.dromara.common.ys.model.res.train.AllStationModel;
import org.dromara.common.ys.model.res.train.OrderRefundApplyModel;
import org.dromara.common.ys.model.res.train.OrderRefundDetailModel;
import org.dromara.common.ys.model.res.train.OrderRefundListModel;
import org.dromara.common.ys.model.res.train.QueryModel;
import org.dromara.common.ys.model.res.train.TrainStopModel;
import org.dromara.common.ys.model.res.train.*;
import java.util.List;
......@@ -21,7 +25,7 @@ public interface ITrainService {
* @param model 查询参数
* @return 查询结果
*/
List<org.dromara.common.ys.model.res.train.QueryModel> queryModel(String userId, QueryModel model);
List<QueryModel> queryModel(String userId, org.dromara.common.ys.model.req.train.QueryModel model);
/**
* 查询所有车站信息
......@@ -76,4 +80,49 @@ public interface ITrainService {
*/
Boolean cancelOrder(String userId, CancelOrderModel model);
/**
* 车次经停站查询列表
*
* @param userId 用户id
* @param model 查询参数
* @return 查询结果
*/
List<TrainStopModel> queryTrainStop(String userId, org.dromara.common.ys.model.req.train.TrainStopModel model);
/**
* 申请退票
*
* @param userId 用户id
* @param model 退票参数
* @return 退票结果
*/
OrderRefundApplyModel orderRefundApply(String userId, org.dromara.common.ys.model.req.train.OrderRefundApplyModel model);
/**
* 退票单详情
*
* @param userId 用户id
* @param model 退票参数
* @return 退票结果
*/
OrderRefundDetailModel orderRefundDetail(String userId, org.dromara.common.ys.model.req.train.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.train.OrderRefundListModel model);
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/TrainServiceImpl.java
浏览文件 @ dd728233
......@@ -10,10 +10,13 @@ import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.enums.DomainEnum;
import org.dromara.common.ys.enums.train.TrainApiEnum;
import org.dromara.common.ys.model.req.train.*;
import org.dromara.common.ys.model.res.train.CheckAccountResModel;
import org.dromara.common.ys.model.res.train.OrderBookResModel;
import org.dromara.common.ys.model.res.train.OrderInfoModel;
import org.dromara.common.ys.model.res.train.OrderListQueryResModel;
import org.dromara.common.ys.model.res.train.AllStationModel;
import org.dromara.common.ys.model.res.train.OrderRefundApplyModel;
import org.dromara.common.ys.model.res.train.OrderRefundDetailModel;
import org.dromara.common.ys.model.res.train.OrderRefundListModel;
import org.dromara.common.ys.model.res.train.QueryModel;
import org.dromara.common.ys.model.res.train.*;
import org.dromara.common.ys.model.res.train.TrainStopModel;
import org.dromara.common.ys.service.ITrainService;
import org.springframework.stereotype.Service;
......@@ -28,7 +31,7 @@ import java.util.List;
public class TrainServiceImpl implements ITrainService {
@Override
public List<org.dromara.common.ys.model.res.train.QueryModel> queryModel(String userId, QueryModel model) {
public List<QueryModel> queryModel(String userId, org.dromara.common.ys.model.req.train.QueryModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -42,11 +45,11 @@ public class TrainServiceImpl implements ITrainService {
if (StrUtil.isEmpty(res.getData())) {
return Collections.emptyList();
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("trainList"), org.dromara.common.ys.model.res.train.QueryModel.class);
return JSON.parseArray(JSON.parseObject(res.getData()).getString("trainList"), QueryModel.class);
}
@Override
public List<org.dromara.common.ys.model.res.train.AllStationModel> getAllStation(String userId) {
public List<AllStationModel> getAllStation(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
......@@ -57,7 +60,7 @@ public class TrainServiceImpl implements ITrainService {
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("list"), org.dromara.common.ys.model.res.train.AllStationModel.class);
return JSON.parseArray(JSON.parseObject(res.getData()).getString("list"), AllStationModel.class);
}
@Override
......@@ -150,4 +153,95 @@ public class TrainServiceImpl implements ITrainService {
}
return true;
}
@Override
public List<TrainStopModel> queryTrainStop(String userId, org.dromara.common.ys.model.req.train.TrainStopModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
TrainApiEnum.QUERY_BY_TRAIN_NO.getUrl(),
userId,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("trainNoList"), TrainStopModel.class);
}
@Override
public OrderRefundApplyModel orderRefundApply(String userId, org.dromara.common.ys.model.req.train.OrderRefundApplyModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
TrainApiEnum.REFUND_APPLY.getUrl(),
userId,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseObject(JSON.parseObject(res.getData()).toJSONString(), OrderRefundApplyModel.class);
}
@Override
public OrderRefundDetailModel orderRefundDetail(String userId, org.dromara.common.ys.model.req.train.OrderRefundDetailModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
TrainApiEnum.REFUND_QUERY_REFUND_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
);
if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
throw new RuntimeException(res.getTips());
}
return JSON.parseArray(JSON.parseObject(res.getData()).getString("orderGather"), OrderRefundDetailModel.class).get(0);
}
@Override
public Boolean orderRefundCancel(String userId, OrderRefundCancelModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
TrainApiEnum.REFUND_CANCEL.getUrl(),
userId,
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.train.OrderRefundListModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
TrainApiEnum.REFUND_QUERY_REFUND_ORDER.getUrl(),
userId,
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("refundListApiBeanPageInfo"), 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
浏览文件 @ dd728233
......@@ -85,7 +85,6 @@ public class AirportController extends BaseController {
/**
* 查询保险列表
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/insuranceList")
public R<List<org.dromara.common.ys.model.res.insurance.BxcpModel>> insuranceList() {
return R.ok(insuranceService.list(getUserId(), new BxcpModel().setCplx(Cplx.DOMESTIC.getCode())));
......@@ -141,7 +140,6 @@ public class AirportController extends BaseController {
/**
* 订单列表
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/orderList")
public R<PageInfo<org.dromara.common.ys.model.res.airport.OrderListModel>> orderList(OrderListModel model) {
model.setBookNo(getUserId());
......@@ -160,7 +158,6 @@ public class AirportController extends BaseController {
/**
* 订单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/orderDetail")
public R<QueryTkOrderModel> orderDetail(org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
return R.ok(airPortService.detail(getUserId(), model));
......@@ -169,7 +166,6 @@ public class AirportController extends BaseController {
/**
* 获取经停信息
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/queryFlightStop")
public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopModel model) {
return R.ok(airPortService.queryFlightStop("15301818478", model));
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java
浏览文件 @ dd728233
......@@ -38,7 +38,6 @@ public class HotelController extends BaseController {
/**
* 酒店详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/hotel/detail")
public R<HotelDetailModel> hotelDetail(org.dromara.common.ys.model.req.hotel.HotelDetailModel model) {
return R.ok(hotelService.hotelDetail(getUserId(), model));
......@@ -47,7 +46,6 @@ public class HotelController extends BaseController {
/**
* 酒店询价
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/hotel/pricePlan")
public R<HotelShoppingPricePlanModel> hotelPricePlan(org.dromara.common.ys.model.req.hotel.HotelShoppingPricePlanModel model) {
return R.ok(hotelService.hotelPricePlan(getUserId(), model));
......@@ -56,7 +54,6 @@ public class HotelController extends BaseController {
/**
* 酒店列表
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/hotel/list")
public R<PageInfo<HotelShoppingBaseListModel>> hotelList(org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model) {
return R.ok(hotelService.hotelList(getUserId(), model));
......@@ -65,7 +62,7 @@ public class HotelController extends BaseController {
/**
* 下单
*/
@GlobalTransactional(timeoutMills = 600000)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/book")
public R<HotelOrderBookModel> orderBook(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) {
HotelOrderBookModel book = hotelService.orderBook(getUserId(), model);
......@@ -76,7 +73,7 @@ public class HotelController extends BaseController {
/**
* 取消订单
*/
@GlobalTransactional(timeoutMills = 600000)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/cancel")
public R<CancelOrderModel> orderCancel(@RequestBody org.dromara.common.ys.model.req.hotel.CancelOrderModel model) {
CancelOrderModel cancel = hotelService.orderCancel(getUserId(), model);
......@@ -87,7 +84,7 @@ public class HotelController extends BaseController {
/**
* 酒店支付
*/
@GlobalTransactional(timeoutMills = 600000)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/pay")
public R<Boolean> orderPay(@RequestBody org.dromara.common.ys.model.req.hotel.PayOrderModel model) {
boolean result = hotelService.orderPay(getUserId(), model);
......@@ -98,7 +95,6 @@ public class HotelController extends BaseController {
/**
* 酒店订单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/hotelDetail")
public R<HotelOrderQueryDetailModel> orderHotelDetail(org.dromara.common.ys.model.req.hotel.HotelOrderQueryDetailModel model) {
return R.ok(hotelService.hotelOrderDetail(getUserId(), model));
......@@ -107,7 +103,6 @@ public class HotelController extends BaseController {
/**
* 订单列表
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/list")
public R<PageInfo<HotelOrderQueryListModel>> orderList(org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model) {
model.setBookNo(getUserId());
......@@ -117,7 +112,6 @@ public class HotelController extends BaseController {
/**
* 订单列表
*/
@GetMapping("/order/local/list")
public R<TableDataInfo<OrderHotelVo>> orderLocalList(OrderHotelBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
......@@ -127,7 +121,6 @@ public class HotelController extends BaseController {
/**
* 订单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/detail")
public R<List<HtOrderInfoModel>> orderDetail(org.dromara.common.ys.model.req.hotel.HotelQueryOrderModel model) {
return R.ok(hotelService.orderDetail(getUserId(), model));
......@@ -136,7 +129,6 @@ public class HotelController extends BaseController {
/**
* 退单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/refundDetail")
public R<List<HtRefundInfoModel>> orderRefundDetail(org.dromara.common.ys.model.req.hotel.HotelQueryRefundOrderModel model) {
return R.ok(hotelService.orderRefundDetail(getUserId(), model));
......@@ -145,7 +137,6 @@ public class HotelController extends BaseController {
/**
* 询价单保存
*/
@GlobalTransactional(timeoutMills = 600000)
@PostMapping("/order/xjd")
public R<HotelOrderXjdModel> orderXjd(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderXjdModel model) {
return R.ok(hotelService.orderXjd(getUserId(), model));
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java
浏览文件 @ dd728233
......@@ -18,6 +18,10 @@ import org.dromara.common.ys.model.req.train.QueryModel;
import org.dromara.common.ys.model.req.train.*;
import org.dromara.common.ys.model.res.comomResource.CityModel;
import org.dromara.common.ys.model.res.train.AllStationModel;
import org.dromara.common.ys.model.res.train.OrderRefundApplyModel;
import org.dromara.common.ys.model.res.train.OrderRefundDetailModel;
import org.dromara.common.ys.model.res.train.OrderRefundListModel;
import org.dromara.common.ys.model.res.train.TrainStopModel;
import org.dromara.common.ys.model.res.train.*;
import org.dromara.common.ys.service.ICommonResourceService;
import org.dromara.common.ys.service.ITrainService;
......@@ -220,7 +224,7 @@ public class TrainController extends BaseController {
/**
* 创建订单
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("bookOrder")
public R<OrderBookResModel> bookOrder(@RequestBody OrderBookReqModel model) {
OrderBookResModel res = trainService.bookOrder(getUserId(), model);
......@@ -240,7 +244,6 @@ public class TrainController extends BaseController {
/**
* 订单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/orderDetail")
public R<OrderInfoModel> orderDetail(OrderQueryModel model) {
return R.ok(trainService.detail(getUserId(), model));
......@@ -249,7 +252,7 @@ public class TrainController extends BaseController {
/**
* 取消订单
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/cancel")
public R<Boolean> cancel(@RequestBody CancelOrderModel model) {
trainService.cancelOrder(getUserId(), model);
......@@ -281,4 +284,46 @@ public class TrainController extends BaseController {
return R.ok(true);
}
/**
* 获取经停信息
*/
@GetMapping("/queryTrainStop")
public R<List<TrainStopModel>> queryTrainStop(org.dromara.common.ys.model.req.train.TrainStopModel model) {
return R.ok(trainService.queryTrainStop(getUserId(), model));
}
/**
* 退票单申请
*/
@PostMapping("/orderRefund/apply")
public R<OrderRefundApplyModel> orderRefundApply(@RequestBody org.dromara.common.ys.model.req.train.OrderRefundApplyModel model) {
OrderRefundApplyModel res = trainService.orderRefundApply(getUserId(), model);
return R.ok(res);
}
/**
* 退票单详情
*/
@GetMapping("/orderRefund/detail")
public R<OrderRefundDetailModel> orderRefundDetail(org.dromara.common.ys.model.req.train.OrderRefundDetailModel model) {
return R.ok(trainService.orderRefundDetail(getUserId(), model));
}
/**
* 退票单取消
*/
@GetMapping("/orderRefund/cancel")
public R<Boolean> orderRefundCancel(org.dromara.common.ys.model.req.train.OrderRefundCancelModel model) {
return R.ok(trainService.orderRefundCancel(getUserId(), model));
}
/**
* 退票单列表
*/
@GetMapping("/orderRefund/list")
public R<PageInfo<OrderRefundListModel>> orderRefundList(org.dromara.common.ys.model.req.train.OrderRefundListModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.orderRefundList(getUserId(), model));
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java
浏览文件 @ dd728233
......@@ -57,7 +57,6 @@ public class VehiclesController extends BaseController {
/**
* 订单详情
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/detail")
public R<org.dromara.common.ys.model.res.vehicles.OrderDetailModel> orderDetail(OrderDetailModel model) {
return R.ok(vehiclesService.detail(getUserId(), model));
......@@ -66,7 +65,6 @@ public class VehiclesController extends BaseController {
/**
* 订单列表
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/list")
public R<PageInfo<OrderListModel>> orderList(org.dromara.common.ys.model.req.vehicles.OrderListModel model) {
model.setBookNo(getUserId());
......@@ -76,7 +74,7 @@ public class VehiclesController extends BaseController {
/**
* 下单接口(即时用车)
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/bookJsyc")
public R<OrderBookJsycModel> bookOrderJsyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookJsycModel model) {
model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
......@@ -88,7 +86,7 @@ public class VehiclesController extends BaseController {
/**
* 下单接口(预约用车)
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/bookYyyc")
public R<OrderBookYyycModel> bookOrderYyyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookYyycModel model) {
model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
......@@ -100,7 +98,6 @@ public class VehiclesController extends BaseController {
/**
* 获取司机位置
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/getDriverLocation")
public R<DriverLocationModel> getDriverLocation(org.dromara.common.ys.model.req.vehicles.DriverLocationModel model) {
return R.ok(vehiclesService.getDriverLocation(getUserId(), model));
......@@ -109,7 +106,6 @@ public class VehiclesController extends BaseController {
/**
* 获取罚金金额
*/
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("/order/getCancelFee")
public R<CancelFeeModel> getCancelFee(org.dromara.common.ys.model.req.vehicles.CancelFeeModel model) {
return R.ok(vehiclesService.getCancelFee(getUserId(), model));
......@@ -118,7 +114,7 @@ public class VehiclesController extends BaseController {
/**
* 取消订单
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/order/cancel")
public R<OrderCancelModel> orderCancel(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderCancelModel model) {
OrderCancelModel cancel = vehiclesService.cancel(getUserId(), model);
......@@ -132,7 +128,6 @@ public class VehiclesController extends BaseController {
/**
* 获取取消原因集合
*/
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@GetMapping("/getCancelReasonList")
public R<List<OrderGetQxyyModel>> getCancelReason() {
return R.ok(vehiclesService.getCancelReasonList(getUserId()));
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderTrainServiceImpl.java
浏览文件 @ dd728233
......@@ -13,6 +13,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.ys.model.req.train.OrderQueryModel;
import org.dromara.common.ys.model.res.airport.other.OrderPayInfoBean;
import org.dromara.common.ys.model.res.train.*;
import org.dromara.common.ys.model.res.train.bean.BusinessInfo;
import org.dromara.common.ys.model.res.train.bean.PayInfo;
import org.dromara.common.ys.model.res.train.bean.RangeInfo;
import org.dromara.common.ys.model.res.train.bean.TicketInfo;
import org.dromara.common.ys.service.ITrainService;
import org.dromara.server.base.AbstractBaseService;
import org.dromara.server.domain.*;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论