From e12b33379eccfeead532f677a99c7f9e41e34a0d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 16:13:33 +0800
Subject: [PATCH] refactor(mall): 重构活动订单核销接口并添加取消订单功能
---
src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java
index 57c4265..81645a2 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java
@@ -3,8 +3,15 @@
import cc.mrbird.febs.common.annotation.Limit;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.activity.ApiActivityOrderListDto;
+import cc.mrbird.febs.mall.dto.activity.ApiCheckOrderDto;
+import cc.mrbird.febs.mall.dto.activity.ApiExpireOrderDto;
+import cc.mrbird.febs.mall.dto.activity.ApiPayOrderAddCommentDto;
import cc.mrbird.febs.mall.service.HappyActivityService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderInfoVo;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderListVo;
+import cc.mrbird.febs.mall.vo.activity.ApiCheckOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -26,7 +33,6 @@
@ApiOperation(value = "活动报名-新增报名人", notes = "活动报名-新增报名人")
@PostMapping(value = "/addConnect")
- @Limit(key = "addConnect", period = 60, count = 1, name = "活动报名-新增报名人", prefix = "limit")
public FebsResponse addConnect(@RequestBody @Validated ApiOperateRegisterUserDto dto) {
return happyActivityService.addConnect(dto);
@@ -66,9 +72,15 @@
return happyActivityService.connectSave(dto);
}
+ @ApiOperation(value = "活动报名-报名-取消订单", notes = "活动报名-报名-创建订单")
+ @PostMapping(value = "/expireOrder")
+ public FebsResponse expireOrder(@RequestBody @Validated ApiExpireOrderDto dto) {
+
+ return happyActivityService.expireOrder(dto);
+ }
+
@ApiOperation(value = "活动报名-报名-创建订单", notes = "活动报名-报名-创建订单")
@PostMapping(value = "/createOrder")
- @Limit(key = "createOrder", period = 60, count = 1, name = "创建订单", prefix = "limit")
public FebsResponse createOrder(@RequestBody @Validated ApiCreateOrderDto dto) {
return happyActivityService.createOrder(dto);
@@ -76,10 +88,53 @@
@ApiOperation(value = "活动报名-报名-支付订单", notes = "活动报名-报名-支付订单")
@PostMapping(value = "/payOrder")
- @Limit(key = "payOrder", period = 60, count = 1, name = "支付订单", prefix = "limit")
public FebsResponse payOrder(@RequestBody @Validated ApiPayOrderDto dto) {
return happyActivityService.payOrder(dto);
}
+ @ApiOperation(value = "我的报名-列表", notes = "我的报名-列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiActivityOrderListVo.class)
+ })
+ @PostMapping(value = "/orderList")
+ public FebsResponse orderList(@RequestBody ApiActivityOrderListDto dto) {
+
+ return happyActivityService.orderList(dto);
+ }
+
+ @ApiOperation(value = "我的报名-详情", notes = "我的报名-详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiActivityOrderInfoVo.class)
+ })
+ @GetMapping(value = "/orderInfo/{id}")
+ public FebsResponse orderInfo(@PathVariable("id") Long id) {
+
+ return happyActivityService.orderInfo(id);
+ }
+
+ @ApiOperation(value = "我的报名-删除", notes = "我的报名-删除")
+ @GetMapping(value = "/orderDelete/{id}")
+ public FebsResponse orderDelete(@PathVariable("id") Long id) {
+
+ return happyActivityService.orderDelete(id);
+ }
+
+ @ApiOperation(value = "核销门票", notes = "核销门票")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiCheckOrderVo.class)
+ })
+ @PostMapping(value = "/checkOrder")
+ public FebsResponse checkOrder(@RequestBody @Validated ApiCheckOrderDto dto) {
+
+ return happyActivityService.checkOrder(dto);
+ }
+
+ @ApiOperation(value = "我的报名-评价", notes = "我的报名-评价")
+ @PostMapping(value = "/addComment")
+ public FebsResponse addComment(@RequestBody @Validated ApiPayOrderAddCommentDto dto) {
+
+ return happyActivityService.addComment(dto);
+ }
+
}
--
Gitblit v1.9.1