Skip to content

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

部分代码提交

上级 1eb3c14e
隐藏空白字符变更
内嵌 并排
正在显示 包含 324 行增加 和 23 行删除
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IAirportService.java
浏览文件 @ d3f99c63
......@@ -299,7 +299,6 @@ public interface IAirportService {
*/
Boolean orderRefundCancel(String userId, OrderRefundCancelModel model);
/**
* 退票列表
*
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java
浏览文件 @ d3f99c63
......@@ -18,12 +18,31 @@ import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.config.ProdConfig;
import org.dromara.common.ys.constant.Cplx;
import org.dromara.common.ys.constant.TripType;
import org.dromara.common.ys.model.req.airport.OrderConfirmModel;
import org.dromara.common.ys.model.req.airport.OrderListModel;
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.req.airport.bookOrder.BookOrderModel;
import org.dromara.common.ys.model.req.insurance.BxcpModel;
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.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.model.res.comomResource.AirportModel;
import org.dromara.common.ys.service.IAirportService;
......@@ -58,7 +77,7 @@ public class AirportController extends BaseController {
private static final String AIRPORT = "airport:ys" ;
private final IAirportService airPortService;
private final IAirportService airportService;
private final ICommonResourceService commonResourceService;
private final IInsuranceService insuranceService;
private final IOrderAirportService orderAirportService;
......@@ -74,7 +93,7 @@ public class AirportController extends BaseController {
model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
model.setTripType(TripType.PUBLIC.getCode());
return R.ok(airPortService.queryFlight(getUserId(), model));
return R.ok(airportService.queryFlight(getUserId(), model));
}
/**
......@@ -87,7 +106,7 @@ public class AirportController extends BaseController {
model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
model.setTripType(TripType.PUBLIC.getCode());
return R.ok(airPortService.queryFlightMinPrice(getUserId(), model));
return R.ok(airportService.queryFlightMinPrice(getUserId(), model));
}
/**
......@@ -96,7 +115,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("queryMoreCabin")
public R<QueryMoreCabinModel> queryMoreCabin(org.dromara.common.ys.model.req.airport.QueryMoreCabinModel model) {
return R.ok(airPortService.queryMoreCabin(getUserId(), model));
return R.ok(airportService.queryMoreCabin(getUserId(), model));
}
private String getCode(String cityName, List<AirportModel> airPortList) {
......@@ -162,7 +181,7 @@ public class AirportController extends BaseController {
model.setTripType(TripType.PUBLIC.getCode());
String travelNo = model.getSubjectCode();
model.setSubjectCode(null);
List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airPortService.bookOrder(getUserId(), model);
List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airportService.bookOrder(getUserId(), model);
//添加到订单表
orderAirportService.batchSaveOrder(getUserId(), travelNo, StreamUtils.toList(orderList, org.dromara.common.ys.model.res.airport.BookOrderModel::getOrderNo));
return R.ok(orderList);
......@@ -175,7 +194,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@PostMapping("/checkPrice")
public R<OrderCheckPriceModel> checkPrice(@RequestBody org.dromara.common.ys.model.req.airport.OrderCheckPriceModel model) {
return R.ok(airPortService.checkPrice(getUserId(), model));
return R.ok(airportService.checkPrice(getUserId(), model));
}
/**
......@@ -184,7 +203,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@PostMapping("/confirm")
public R<Boolean> confirm(@RequestBody OrderConfirmModel model) {
airPortService.confirmOrder(getUserId(), model);
airportService.confirmOrder(getUserId(), model);
//跟新到订单表
orderAirportService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(true);
......@@ -196,7 +215,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@PostMapping("/payOrder")
public R<Boolean> payOrder(@RequestBody OrderPayModel model) {
airPortService.payOrder(getUserId(), model);
airportService.payOrder(getUserId(), model);
//跟新到订单表
orderAirportService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(true);
......@@ -208,7 +227,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@PostMapping("/cancel")
public R<Boolean> cancel(@RequestBody CancelOrderModel model) {
airPortService.cancelOrder(getUserId(), model);
airportService.cancelOrder(getUserId(), model);
//跟新到订单表
orderAirportService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(true);
......@@ -220,7 +239,7 @@ public class AirportController extends BaseController {
@GetMapping("/orderList")
public R<PageInfo<org.dromara.common.ys.model.res.airport.OrderListModel>> orderList(OrderListModel model) {
model.setBookNo(getUserId());
return R.ok(airPortService.orderList(getUserId(), model));
return R.ok(airportService.orderList(getUserId(), model));
}
/**
......@@ -237,7 +256,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/queryFlightByHbh")
public R<List<QueryFlightByHbhModel>> queryFlightByHbh(org.dromara.common.ys.model.req.airport.QueryFlightByHbhModel model) {
return R.ok(airPortService.queryFlightByHbh(getUserId(), model));
return R.ok(airportService.queryFlightByHbh(getUserId(), model));
}
/**
......@@ -245,7 +264,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderDetail")
public R<QueryTkOrderModel> orderDetail(org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
QueryTkOrderModel detail = airPortService.detail(getUserId(), model);
QueryTkOrderModel detail = airportService.detail(getUserId(), model);
//跟新到订单表
orderAirportService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(detail);
......@@ -256,7 +275,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/queryFlightStop")
public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopModel model) {
return R.ok(airPortService.queryFlightStop(ProdConfig.USE_ID, model));
return R.ok(airportService.queryFlightStop(ProdConfig.USE_ID, model));
}
/**
......@@ -264,7 +283,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderRefundOfVoyage")
public R<RefundOfVoyageModel> orderRefundOfVoyage(org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model) {
return R.ok(airPortService.orderRefundOfVoyage(getUserId(), model));
return R.ok(airportService.orderRefundOfVoyage(getUserId(), model));
}
......@@ -274,7 +293,7 @@ public class AirportController extends BaseController {
@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);
OrderRefundAddModel res = airportService.orderRefundAdd(getUserId(), model);
orderAirportRefundService.batchSaveOrder(getUserId(), model.getOrderNo(), res.getRefundNoList());
return R.ok(res);
}
......@@ -284,7 +303,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderRefund/detail")
public R<List<OrderRefundDetailModel>> orderRefundDetail(org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model) {
return R.ok(airPortService.orderRefundDetail(getUserId(), model));
return R.ok(airportService.orderRefundDetail(getUserId(), model));
}
/**
......@@ -293,7 +312,7 @@ public class AirportController extends BaseController {
@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);
Boolean result = airportService.orderRefundCancel(getUserId(), model);
orderAirportRefundService.updateOrderInfo(List.of(model.getRefundNo()));
return R.ok(result);
}
......@@ -304,7 +323,7 @@ public class AirportController extends BaseController {
@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));
return R.ok(airportService.orderRefundList(getUserId(), model));
}
/**
......@@ -346,4 +365,132 @@ public class AirportController extends BaseController {
}));
}
/**
* 获取退改规则
*/
@PostMapping("/queryFlightRule")
public R<QueryFlightRuleModel> queryFlightRule(@RequestBody org.dromara.common.ys.model.req.airport.QueryFlightRuleModel model) {
String userId = getUserId();
return R.ok(airportService.queryFlightRule(userId, model));
}
/**
* 匹配差旅标准
*/
@PostMapping("/matchClbz")
public R<MatchClbzModel> matchClbz(@RequestBody org.dromara.common.ys.model.req.airport.MatchClbzModel model) {
String userId = getUserId();
return R.ok(airportService.matchClbz(userId, model));
}
/**
* 航段验价
*/
@PostMapping("/checkPriceForFlight")
public R<CheckPriceForFlightModel> checkPriceForFlight(@RequestBody org.dromara.common.ys.model.req.airport.CheckPriceForFlightModel model) {
String userId = getUserId();
return R.ok(airportService.checkPriceForFlight(userId, model));
}
/**
* 验舱
*/
@PostMapping("/checkCabin")
public R<CheckCabinModel> checkCabin(@RequestBody org.dromara.common.ys.model.req.airport.CheckCabinModel model) {
String userId = getUserId();
return R.ok(airportService.checkCabin(userId, model));
}
/**
* 验证三方协议白名单
*/
@PostMapping("/checkXyhBmd")
public R<CheckXyhBmdModel> checkXyhBmd(@RequestBody org.dromara.common.ys.model.req.airport.CheckXyhBmdModel model) {
String userId = getUserId();
return R.ok(airportService.checkXyhBmd(userId, model));
}
/**
* 获取客票状态
*/
@PostMapping("/planeCheckState")
public R<PlaneCheckStateModel> planeCheckState(@RequestBody org.dromara.common.ys.model.req.airport.PlaneCheckStateModel model) {
String userId = getUserId();
return R.ok(airportService.planeCheckState(userId, model));
}
/**
* 根据票号获取客票状态
*/
@PostMapping("/getTicketStatus")
public R<GetTicketStatusModel> getTicketStatus(@RequestBody org.dromara.common.ys.model.req.airport.GetTicketStatusModel model) {
String userId = getUserId();
return R.ok(airportService.getTicketStatus(userId, model));
}
/**
* 获取可改签航段
*/
@PostMapping("/getVoyageForChange")
public R<GetVoyageForChangeModel> getVoyageForChange(@RequestBody org.dromara.common.ys.model.req.airport.GetVoyageForChangeModel model) {
String userId = getUserId();
return R.ok(airportService.getVoyageForChange(userId, model));
}
/**
* 改签航班查询
*/
@PostMapping("/queryFlightForChange")
public R<QueryFlightForChangeModel> queryFlightForChange(@RequestBody org.dromara.common.ys.model.req.airport.QueryFlightForChangeModel model) {
String userId = getUserId();
return R.ok(airportService.queryFlightForChange(userId, model));
}
/**
* 申请改签
*/
@PostMapping("/addChangeOrderModel")
public R<AddChangeOrderModel> addChangeOrderModel(@RequestBody org.dromara.common.ys.model.req.airport.AddChangeOrderModel model) {
String userId = getUserId();
return R.ok(airportService.addChangeOrderModel(userId, model));
}
/**
* 改签单详情
*/
@PostMapping("/queryChangeOrder")
public R<QueryChangeOrderModel> queryChangeOrder(@RequestBody org.dromara.common.ys.model.req.airport.QueryChangeOrderModel model) {
String userId = getUserId();
return R.ok(airportService.queryChangeOrder(userId, model));
}
/**
* 取消改签单
*/
@PostMapping("/cancelChangeOrder")
public R<Boolean> cancelChangeOrder(@RequestBody CancelChangeOrderModel model) {
String userId = getUserId();
airportService.cancelChangeOrder(userId, model);
return R.ok(true);
}
/**
* 改签单调度
*/
@PostMapping("/changeDispatch")
public R<Boolean> changeDispatch(@RequestBody DispatchChangeOrderModel model) {
String userId = getUserId();
airportService.changeDispatch(userId, model);
return R.ok(true);
}
/**
* 退签单列表
*/
@PostMapping("/changeQueryList")
public R<PageInfo<PlaneOrderQueryChangeOrderApiBeanModel>> changeQueryList(@RequestBody PlaneOrderQueryChangeOrderApiModel model) {
String userId = getUserId();
return R.ok(airportService.changeQueryList(userId, model));
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java
浏览文件 @ d3f99c63
......@@ -21,6 +21,8 @@ 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.TrChangeInfoBeanModel;
import org.dromara.common.ys.model.res.train.TrainSetRegisterModel;
import org.dromara.common.ys.model.res.train.TrainStopModel;
import org.dromara.common.ys.model.res.train.*;
import org.dromara.common.ys.service.ICommonResourceService;
......@@ -349,4 +351,144 @@ public class TrainController extends BaseController {
return R.ok(orderTrainRefundService.queryPageList(bo, pageQuery));
}
/**
* 改签单详情
*/
@GetMapping("/changeOrder/detail")
public R<List<TrChangeInfoBeanModel>> queryChangeOrder(TrainQueryChangeOrderModel model) {
return R.ok(trainService.queryChangeOrder(getUserId(), model));
}
/**
* 改签单详情
*/
@GetMapping("/orderChangeOrder/detail")
public R<List<TrChangeInfoBeanModel>> orderQueryChangeOrder(TrainQueryChangeOrderModel model) {
return R.ok(trainService.orderQueryChangeOrder(getUserId(), model));
}
/**
* 退单详情
*/
@GetMapping("/refundOrder/detail")
public R<List<TrRefundInfoBeanModel>> queryRefundOrder(TrainQueryRefundOrderModel model) {
return R.ok(trainService.queryRefundOrder(getUserId(), model));
}
/**
* 查询12306账号下的常旅客接口
*/
@GetMapping("/12306/findClk")
public R<List<TrainSetFindClkBeanModel>> findClk(TrainSetFindClkModel model) {
return R.ok(trainService.findClk(getUserId(), model));
}
/**
* 修改常旅客信息
*/
@PostMapping("/12306/saveClk")
public R<List<TrainSetSaveClkResBeanModel>> saveClk(@RequestBody TrainSetSaveClkModel model) {
return R.ok(trainService.saveClk(getUserId(), model));
}
/**
* 注册12306账号
*/
@PostMapping("/12306/register")
public R<TrainSetRegisterModel> register(@RequestBody org.dromara.common.ys.model.req.train.TrainSetRegisterModel model) {
return R.ok(trainService.register(getUserId(), model));
}
/**
* 取消改签单
*/
@PostMapping("/changeOrder/cancel")
public R<Boolean> changeCancel(@RequestBody TrainChangeCancelApiModel model) {
trainService.changeCancel(getUserId(), model);
return R.ok(true);
}
/**
* 改签单确认出票
*/
@PostMapping("/changeOrder/confirm")
public R<Boolean> changeConfirm(@RequestBody TrainChangeConfirmApiModel model) {
trainService.changeConfirm(getUserId(), model);
return R.ok(true);
}
/**
* 改签单支付
*/
@PostMapping("/changeOrder/pay")
public R<Boolean> changeConfirmPay(@RequestBody org.dromara.common.ys.model.req.hotel.PayOrderModel model) {
trainService.changeConfirm(getUserId(), model);
return R.ok(true);
}
/**
* 校验12306账号核验接口接收到的短信验证码
*/
@PostMapping("/12306/checkAccountCode")
public R<Boolean> checkAccountCode(@RequestBody TrainSetCheckAccountCodeModel model) {
trainService.checkAccountCode(getUserId(), model);
return R.ok(true);
}
/**
* 校验注册12306账号接口接收到的短信验证码
*/
@PostMapping("/12306/checkRegisterCode")
public R<Boolean> checkRegisterCode(@RequestBody TrainSetCheckRegisterCodeModel model) {
trainService.checkRegisterCode(getUserId(), model);
return R.ok(true);
}
/**
* 校验注册12306账号接口接收到的短信验证码
*/
@PostMapping("/12306/checkResetPwd")
public R<Boolean> checkResetPwd(@RequestBody TrainSetCheckResetPwdModel model) {
trainService.checkResetPwd(getUserId(), model);
return R.ok(true);
}
/**
* 删除常旅客接口
*/
@PostMapping("/12306/deleteClk")
public R<Boolean> deleteClk(@RequestBody TrainSetDeleteClkModel model) {
trainService.deleteClk(getUserId(), model);
return R.ok(true);
}
/**
* 修改12306账号密码
*/
@PostMapping("/12306/resetPwd")
public R<Boolean> resetPwd(@RequestBody TrainSetResetPwdModel model) {
trainService.resetPwd(getUserId(), model);
return R.ok(true);
}
/**
* 退票单列表
*/
@GetMapping("/refundOrder/list")
public R<PageInfo<TrainRefundQueryRefundListApiBeanModel>> queryRefundList(TrainRefundQueryRefundListApiModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.queryRefundList(getUserId(), model));
}
/**
* 改签单列表
*/
@GetMapping("/changeOrder/list")
public R<PageInfo<TrainChangeQueryChangeListApiBeanModel>> queryChangeList(TrainoChangeQueryChangeListApiModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.queryChangeList(getUserId(), model));
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java
浏览文件 @ d3f99c63
......@@ -9,10 +9,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.constant.TripType;
import org.dromara.common.ys.model.req.vehicles.ConfirmPayApiModel;
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;
......@@ -167,4 +167,17 @@ public class VehiclesController extends BaseController {
return R.ok(true);
}
/**
* 确认扣款
*
* @param model 确认扣款参数
* @return 操作结果
*/
@PostMapping("/confirmPay")
public R<Boolean> confirmPay(@RequestBody ConfirmPayApiModel model) {
String userId = getUserId();
vehiclesService.confirmPay(userId, model);
return R.ok(true);
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论