提交 b5a13ea1 authored 作者: hzh's avatar hzh

火车票退票功能实现

上级 8e9d61af
...@@ -27,8 +27,11 @@ import org.dromara.common.ys.service.ICommonResourceService; ...@@ -27,8 +27,11 @@ import org.dromara.common.ys.service.ICommonResourceService;
import org.dromara.common.ys.service.ITrainService; import org.dromara.common.ys.service.ITrainService;
import org.dromara.server.base.BaseController; import org.dromara.server.base.BaseController;
import org.dromara.server.domain.bo.OrderTrainBo; import org.dromara.server.domain.bo.OrderTrainBo;
import org.dromara.server.domain.bo.OrderTrainRefundBo;
import org.dromara.server.domain.vo.OrderTrainRefundVo;
import org.dromara.server.domain.vo.OrderTrainVo; import org.dromara.server.domain.vo.OrderTrainVo;
import org.dromara.server.dubbo.RemoteOrderServiceImpl; import org.dromara.server.dubbo.RemoteOrderServiceImpl;
import org.dromara.server.service.IOrderTrainRefundService;
import org.dromara.server.service.IOrderTrainService; import org.dromara.server.service.IOrderTrainService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -59,6 +62,7 @@ public class TrainController extends BaseController { ...@@ -59,6 +62,7 @@ public class TrainController extends BaseController {
private final ITrainService trainService; private final ITrainService trainService;
private final IOrderTrainService orderTrainService; private final IOrderTrainService orderTrainService;
private final IOrderTrainRefundService orderTrainRefundService;
private final ICommonResourceService commonResourceService; private final ICommonResourceService commonResourceService;
/** /**
...@@ -264,8 +268,8 @@ public class TrainController extends BaseController { ...@@ -264,8 +268,8 @@ public class TrainController extends BaseController {
* 订单列表(本地) * 订单列表(本地)
*/ */
@GetMapping("/local/orderList") @GetMapping("/local/orderList")
public R<TableDataInfo<OrderTrainVo>> list(OrderTrainBo bo, PageQuery pageQuery) { public R<TableDataInfo<OrderTrainVo>> localList(PageQuery pageQuery) {
bo.setPersonCode(getUserId()); OrderTrainBo bo = new OrderTrainBo().setPersonCode(getUserId());
return R.ok(orderTrainService.queryPageList(bo, pageQuery)); return R.ok(orderTrainService.queryPageList(bo, pageQuery));
} }
...@@ -295,9 +299,11 @@ public class TrainController extends BaseController { ...@@ -295,9 +299,11 @@ public class TrainController extends BaseController {
/** /**
* 退票单申请 * 退票单申请
*/ */
@GlobalTransactional(rollbackFor = Exception.class)
@PostMapping("/orderRefund/apply") @PostMapping("/orderRefund/apply")
public R<OrderRefundApplyModel> orderRefundApply(@RequestBody org.dromara.common.ys.model.req.train.OrderRefundApplyModel model) { public R<OrderRefundApplyModel> orderRefundApply(@RequestBody org.dromara.common.ys.model.req.train.OrderRefundApplyModel model) {
OrderRefundApplyModel res = trainService.orderRefundApply(getUserId(), model); OrderRefundApplyModel res = trainService.orderRefundApply(getUserId(), model);
orderTrainRefundService.batchSaveOrder(getUserId(), res.getRefundNoList());
return R.ok(res); return R.ok(res);
} }
...@@ -312,9 +318,12 @@ public class TrainController extends BaseController { ...@@ -312,9 +318,12 @@ public class TrainController extends BaseController {
/** /**
* 退票单取消 * 退票单取消
*/ */
@GetMapping("/orderRefund/cancel") @GlobalTransactional(rollbackFor = Exception.class)
public R<Boolean> orderRefundCancel(org.dromara.common.ys.model.req.train.OrderRefundCancelModel model) { @PostMapping("/orderRefund/cancel")
return R.ok(trainService.orderRefundCancel(getUserId(), model)); public R<Boolean> orderRefundCancel(@RequestBody org.dromara.common.ys.model.req.train.OrderRefundCancelModel model) {
Boolean result = trainService.orderRefundCancel(getUserId(), model);
orderTrainRefundService.updateOrderInfo(List.of(model.getRefundNo()));
return R.ok(result);
} }
/** /**
...@@ -326,4 +335,13 @@ public class TrainController extends BaseController { ...@@ -326,4 +335,13 @@ public class TrainController extends BaseController {
return R.ok(trainService.orderRefundList(getUserId(), model)); return R.ok(trainService.orderRefundList(getUserId(), model));
} }
/**
* 退票单列表(本地)
*/
@GetMapping("/local/orderRefund/list")
public R<TableDataInfo<OrderTrainRefundVo>> list(PageQuery pageQuery) {
OrderTrainRefundBo bo = new OrderTrainRefundBo().setPersonCode(getUserId());
return R.ok(orderTrainRefundService.queryPageList(bo, pageQuery));
}
} }
...@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank; ...@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
...@@ -18,6 +19,7 @@ import org.dromara.server.domain.OrderTrainRefund; ...@@ -18,6 +19,7 @@ import org.dromara.server.domain.OrderTrainRefund;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@AutoMapper(target = OrderTrainRefund.class, reverseConvertGenerate = false) @AutoMapper(target = OrderTrainRefund.class, reverseConvertGenerate = false)
public class OrderTrainRefundBo extends BaseEntity { public class OrderTrainRefundBo extends BaseEntity {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论