From 92c26cea4de00349b346f71da3cf530b26c31eb0 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 10 Jun 2025 09:40:59 +0800 Subject: [PATCH] fix(mall): 修复用户重复加入标签的问题 --- src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 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 8538742..6c921d1 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 @@ -5,6 +5,7 @@ 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.*; @@ -71,6 +72,13 @@ 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") public FebsResponse createOrder(@RequestBody @Validated ApiCreateOrderDto dto) { @@ -112,7 +120,7 @@ return happyActivityService.orderDelete(id); } - @ApiOperation(value = "核销门票", notes = "核销门票") + @ApiOperation(value = "核销门票-详细信息", notes = "核销门票-详细信息") @ApiResponses({ @ApiResponse(code = 200, message = "success", response = ApiCheckOrderVo.class) }) @@ -122,6 +130,16 @@ return happyActivityService.checkOrder(dto); } + @ApiOperation(value = "核销门票-确认核销", notes = "核销门票-确认核销") + @ApiResponses({ + @ApiResponse(code = 200, message = "success", response = ApiCheckOrderVo.class) + }) + @PostMapping(value = "/insureOrder") + public FebsResponse insureOrder(@RequestBody @Validated ApiCheckOrderDto dto) { + + return happyActivityService.insureOrder(dto); + } + @ApiOperation(value = "我的报名-评价", notes = "我的报名-评价") @PostMapping(value = "/addComment") public FebsResponse addComment(@RequestBody @Validated ApiPayOrderAddCommentDto dto) { -- Gitblit v1.9.1