From 286c0308534688baf50d93c1fc8c2f372912bd40 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 09 May 2025 10:42:43 +0800
Subject: [PATCH] feat(mall): 重构轮播图模块
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
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 6d75e0d..737c688 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
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.enumerates.StateUpDownEnum;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
import cc.mrbird.febs.mall.dto.activity.*;
@@ -207,6 +208,8 @@
happyActivity.setName(dto.getName());
happyActivity.setType(dto.getType());
happyActivity.setJoinCnt(dto.getJoinCnt());
+ happyActivity.setExpectCnt(dto.getJoinCnt());
+ happyActivity.setSurplusCnt(dto.getSurplusCnt());
happyActivity.setStartTime(dto.getStartTime());
happyActivity.setEndTime(dto.getEndTime());
happyActivity.setPhone(dto.getPhone());
@@ -368,26 +371,27 @@
}
@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("请选择需要核销的订单");
}
for(Long id : ids){
HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
- happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
- happyActivityOrderMapper.updateById(happyActivityOrder);
+ if(StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode() == happyActivityOrder.getState()){
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
- List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
- new LambdaQueryWrapper<HappyActivityOrderItem>()
- .eq(HappyActivityOrderItem::getOrderId, id)
- );
- if(CollUtil.isNotEmpty(happyActivityOrderItems)){
- happyActivityOrderItems.forEach(happyActivityOrderItem -> {
- happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
- });
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, id)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ });
+ }
}
}
@@ -398,6 +402,10 @@
public FebsResponse activityOrderDel(Long id) {
HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+
+ if(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode() != happyActivityOrder.getState()){
+ throw new FebsException("该订单状态不是已失效状态！");
+ }
if(ObjectUtil.isNotEmpty(happyActivityOrder)){
happyActivityOrder.setDeleteFlag(StateUpDownEnum.UP.getCode());
happyActivityOrderMapper.updateById(happyActivityOrder);
--
Gitblit v1.9.1