From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类，添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑，增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑，移除冗余代码
---
src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityOrderController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 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 2483a64..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
@@ -4,10 +4,14 @@
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;
@@ -29,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);
@@ -69,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);
@@ -79,7 +88,6 @@
@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);
@@ -105,4 +113,38 @@
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 = "核销门票-确认核销")
+ @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) {
+
+ return happyActivityService.addComment(dto);
+ }
+
}
--
Gitblit v1.9.1