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 | 8 ++++++++
src/main/java/cc/mrbird/febs/mall/dto/activity/ApiExpireOrderDto.java | 16 ++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 20 ++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 3 +--
src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java | 2 +-
src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java | 2 ++
src/main/resources/templates/febs/views/modules/votesActivity/orderList.html | 2 +-
8 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
index 484e068..c504b30 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
@@ -241,7 +241,7 @@
*/
@PostMapping("checkOrder")
@ControllerEndpoint(operation = "订单-手动核销", exceptionMessage = "操作失败")
- public FebsResponse checkOrder(@RequestBody AdminHappyActivityCheckOrderDto dto) {
+ public FebsResponse checkOrder(@RequestBody List<Long> dto) {
return adminHappyActivityService.checkOrder(dto);
}
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..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
@@ -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) {
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiExpireOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiExpireOrderDto.java
new file mode 100644
index 0000000..f125546
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiExpireOrderDto.java
@@ -0,0 +1,16 @@
+package cc.mrbird.febs.mall.dto.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value = "ApiExpireOrderDto", description = "参数")
+public class ApiExpireOrderDto {
+
+
+ @ApiModelProperty(value = "订单ID", example = "1")
+ private List<Long> ids;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
index ee17b5c..ab7af8b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
@@ -50,6 +50,8 @@
FebsResponse connectSave(ApiConnectSaveDto dto);
+ FebsResponse expireOrder(ApiExpireOrderDto dto);
+
FebsResponse createOrder(ApiCreateOrderDto dto);
FebsResponse payOrder(ApiPayOrderDto dto);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
index 1a5119e..99fd293 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
@@ -55,7 +55,7 @@
IPage<HappyActivityOrder> activityOrderList(AdminHappyActivityOrderDto dto, QueryRequest request);
- FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto);
+ FebsResponse checkOrder(List<Long> dto);
FebsResponse activityOrderDel(Long id);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index 7fc6010..b07a107 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -370,9 +370,8 @@
}
@Override
- public FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto) {
+ public FebsResponse checkOrder(List<Long> ids) {
- List<Long> ids = dto.getIds();
if (CollUtil.isEmpty(ids)){
return new FebsResponse().fail().message("请选择需要核销的订单");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index bd4092e..7b36573 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -471,6 +471,26 @@
}
@Override
+ public FebsResponse expireOrder(ApiExpireOrderDto dto) {
+ if(CollUtil.isEmpty(dto.getIds())){
+ throw new FebsException("请选择订单");
+ }
+
+ dto.getIds().forEach(id -> {
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+ if(ObjectUtil.isNotEmpty(happyActivityOrder)){
+ Long activityId = happyActivityOrder.getActivityId();
+ Integer numCnt = happyActivityOrder.getNumCnt();
+ this.baseMapper.updateHappyActivitySurplusCnt(activityId,numCnt);
+
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ }
+ });
+ return new FebsResponse().success();
+ }
+
+ @Override
public FebsResponse createOrder(ApiCreateOrderDto dto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
if(CollUtil.isEmpty(dto.getConnectIds())){
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
index 9ee9242..b40c268 100644
--- a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
@@ -218,7 +218,7 @@
dataType: 'json',
headers: { 'Content-Type': 'application/json;charset=utf-8' },
traditional: true,
- data: JSON.stringify('{ids:'+ids+'}'), // 确保传递的是 JSON 格式
+ data: JSON.stringify(ids), // 确保传递的是 JSON 格式
success: function (response) {
if (response.code === 200) {
successCallback(response);
--
Gitblit v1.9.1