部分代码提交

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IAirportService.java

@@ -299,7 +299,6 @@ public interface IAirportService {
      */
     Boolean orderRefundCancel(String userId, OrderRefundCancelModel model);
 
-
     /**
      * 退票列表
      *

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -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

@@ -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);
+    }
+
 }